bug fixing in most places, WIP in BasicOperator.cpp and the reading of parameters in  ReadWrite.cpp
started to move momentum calculation from ReadWrite to GlobalData and BasicOperator
restructured some output to std::cout
fine tuning of some output
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/BasicOperator.h
	include/ReadWrite.h
	main/LapHs.cpp
	main/Makefile
	modules/BasicOperator.cpp
	modules/ReadWrite.cpp
Merge remote-tracking branch 'upstream/master'
Note: 4-point functions do not work!

Conflicts:
	main/BasicOperator.d
	main/BasicOperator.o
	main/GlobalData.d
	main/GlobalData.o
	main/LapHs.cpp
	main/LapHs_Christopher
	main/LapHs_Christopher.cpp
	main/LapHs_Christopher.d
	main/LapHs_Christopher.o
	main/Makefile
	main/ReadWrite.d
	main/ReadWrite.o
	main/config_utils.d
	main/config_utils.o
	main/io_utils.d
	main/io_utils.o
	main/propagator_io.d
	main/propagator_io.o
Merge remote-tracking branch 'upstream/master' Note: 2-point function unchanged up to numerical precision

Conflicts:
	main/LapHs.cpp
	modules/BasicOperator.cpp
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
added the file include/typedefs.h and moved the path for the configurations from ReadWrite.cpp to the input file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	main/LapHs
	main/LapHs.cpp
	main/LapHs_2pt.cpp
	modules/GlobalData.cpp
	modules/ReadWrite.cpp
Merge pull request #1 from chjost/master

Changes mainly to ReadWrite concerning momentum