Bugfix
Merge branch 'newlayout' into deploy-west

Conflicts:
	public/page.coffee
	public/page.js