Default resolution units should be pixels (not angstroms)
Merge branch 'testing' of github.com:antonbarty/cheetah into testing
Added ebeamV5 and viewing of front/back detectors in the GUI
Merge branch 'testing' into cxic9714

Conflicts:
	source/cheetah_ana_pkg/src/cheetah_ana_mod.cpp
	source/libcheetah/src/detectorObject.cpp
	source/libcheetah/src/histogram.cpp