clean up and fix
Merge branch 'new_content' of https://github.com/piermariacosina/localactors into staging

Conflicts:
	public/stylesheets/application.css