register
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance

OK
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance

Conflicts:
	src/Renaissance/WebBundle/Resources/views/Layout/stylesheets.html.twig
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance
ignore services.yml