rafael
rafael
Merge branch 'master' of https://github.com/thesevenlayers/gabriel

Conflicts:
	src/Gbr/FEBundle/Resources/public/css/style.css
Merge branch 'master' of https://github.com/thesevenlayers/gabriel