MULTEM 18.11.2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	Build Crystal/getCrystalbyLayers.cpp
	General/hMT_AtomTypes_GPU.cu
	General/hMT_Detector_CPU.cpp
	General/hMT_Detector_GPU.cu
	General/hMT_General_CPU.cpp
	General/hMT_MicroscopeEffects_GPU.cu
	General/hMT_MulSli_GPU.cu
	General/hMT_Specimen_CPU.h
	General/hMatlab2Cpp.cpp
	General/hMatlab2Cpp.h
	General/hPotential_CPU.cpp
	General/hfegCPU.cpp
	General/hfxegTabData.cpp
	General/hfxgCPU.cpp
	General/hrhorCPU.cpp
	Multislice Code/MULTEMMat.cu