merge main.yml
merge main.css
Merge branch 'test' of https://github.com/songecko/lan-friends-day into
test

Conflicts:
	src/Odiseo/LanBundle/Resources/config/routing/frontend/main.yml