neuer
Merge branch 'master' of http://github.com/belafonte/3DScanner into jan_master

Conflicts:
	CamCalib.cpp
	CamCalib.h
noch paar kommentare