fixed momentum bug for p > 0. testing in progress
Merge remote-tracking branch 'upstream/master'

Conflicts:
	main/LapHs.cpp
	main/Makefile
	modules/ReadWrite.cpp
moved the typedefinitions from the single files to a new header file, also changed the naming scheme