Settings refactoring
Merge branch 'master' of https://github.com/orangehill/photon

Conflicts:
	composer.json
	controllers/TestController.php
	src/routes.php