camera update
merge comit
merge commit
Merge branch 'master' of https://github.com/stevenblaster/craplib

Conflicts:
	projects/VS2012/CRAPengine.v11.suo
	source/SPG/main.cpp