Stuff
More in compo logic
Merge branch 'feature/image_uploader' into develop

Conflicts:
	src/GJA/GameJam/CompoBundle/Resources/public/js/prism.js
	src/GJA/GameJam/GameBundle/Controller/GamePanelController.php