Loader de Eva y back de Natalia !
Merge branch 'master' of https://github.com/sh4ka/vivemadrid

Conflicts:
	src/Bq/FrontBundle/Resources/views/Default/index.html.twig