?
Merge branch 'master' of https://github.com/isflorin/boomin

Conflicts:
	src/Boomin/FrontendBundle/Resources/views/layout.html.twig