layout_start
Merge branch 'master' of github.com:dsounded/brain-portal

Conflicts:
	app/assets/stylesheets/admin.css