Changes
CSS
Merge branch 'dev'

Conflicts:
	layout/css/style.css