comito
Merge branch 'master' of https://github.com/ThiagoFacchini/websitev2

Conflicts:
	src/Rosterelf/WebsiteBundle/Resources/public/css/common.css