Resolved merge conflicts in Science.hpp, derivatves.cpp, incremented VERSION by one further patchlevel