Merge de ouf
Merge branch 'master' of https://github.com/yoanngern/newsroom14

Conflicts:
	web/css/form.css
	web/css/style.css
	web/sass/layout.scss