firstcommit
firstcommit
secondcommit
Merge branch 'master' of https://github.com/lsa2127291/Reinaissance

Conflicts:
	src/Renaissance/CommonBundle/Resources/config/services.yml