sime tweeks
sime tweeks
Merge origin/master

Conflicts:
	public/resources/css/layout.css
Revert "Merge origin/master"

This reverts commit e62d0498586b54d460ffcb417760570c5f19e329.