before update
Merge branch 'NewCamera' of github.com:unicorny/SpaceCraft into NewCamera

Conflicts:
	data/config.ini
	import/include/DRTextureManager.h