Test
Merge branch 'dev' of https://github.com/florentdestremau/pistonski into new_dev

Conflicts:
	app/logs/prod.log
	composer.lock
	vendor/autoload.php
	vendor/composer/autoload_real.php
Merge pull request #1 from florentdestremau/new_dev

Version en prod