Cookies
Merge branch 'master' of https://github.com/zeopix/bredasite

Conflicts:
	app/Resources/views/base.html.twig
	src/Jet/BredaBundle/Resources/.DS_Store