Merge new_layout into website_profile_overview

Conflicts:
	public/script/bob.js
	public/stylesheet/bob.css