0409
Merge branch 'master' of https://github.com/gorgee/pearl2

Conflicts:
	src/Pearl2/DemoBundle/Resources/config/routing.yml
	src/Pearl2/DemoBundle/Resources/views/layout.html.twig