Initialer Camera Commit
Merge branch 'camera' into dragdrop

Conflicts:
	js/app.js