#54: design with 4 images layout.
Modification in the flow.
Merge branch 'master' into fix-grunt

Conflicts:
	app/_layouts/page.html
	app/_scss/site.scss
Minor ajustments.