11_02_2014
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	src/Harpaga/FrontendBundle/Resources/views/Promotion/vue.html.twig
	web/css/style.css