formatting
Refactored web profiles
Merge branch 'master' into animations

Conflicts:
	app/views/walls/show.jade
	public/js/client.js