Towards Reform in Subject-Matter Preparation of Science Teachers: Collaboration Between a Faculty of Science and a Faculty of Education