merge
Merge branch 'master' of github.com:elmewo/armicroscope

Conflicts:
	Configuration/CameraModels_dlr_quat_fixed_pp_test.txt
	Configuration/Interpolated_values_dlr_fixed_pp_test.txt
merge