Layout stable
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/layout.css