Merge branch 'refs/heads/prototype' into feature/participate-content-189

Conflicts:
	app/assets/templates/participate/participate.jst.ejs
	app/assets/templates/user/menu.jst.ejs