Changement of the camera
Merge origin/master

Conflicts:
	crystal-crush/public_html/js/crystal-crush.js