Merge branch 'dev-mahmud' of https://campgit.in.tum.de/berge/campvis into dev-mahmud

Conflicts:
	modules/io/processors/abstractimagereader.cpp
	modules/io/processors/abstractimagereader.h
	modules/io/processors/csvdimagereader.cpp
	modules/io/processors/csvdimagereader.h
	modules/io/processors/genericimagereader.cpp
	modules/io/processors/genericimagereader.h
	modules/io/processors/ltfimagereader.cpp
	modules/io/processors/ltfimagereader.h
	modules/io/processors/mhdimagereader.cpp
	modules/io/processors/mhdimagereader.h
	modules/io/processors/rawimagereader.cpp
	modules/io/processors/rawimagereader.h
	modules/io/processors/vtkimagereader.cpp
	modules/io/processors/vtkimagereader.h