ok
Merge branch 'master' of https://github.com/blazarecki/lionel-enterprise

Conflicts:
	app/AppKernel.php
	app/config/routing.yml