fix
Merge branch 'master' of https://github.com/songecko/nestle-pr.git

Conflicts:
	src/Gecko/NestleBundle/Resources/public/css/moments_mobile.css