fixes
Merge commit '36445d4414c13d9096ec384f430f19e4811a2af5' into staging

Conflicts:
	public/stylesheets/application.css