Two views of the development of educational psychology 1