Merge branches, delete doxys_documentation

Conflicts:
	Makefile
	src/MolSim.cpp
	src/handler/PositionCalculator.o
Correct a small error in "MolSim.cpp" from merge process