Adding stylesheet and fixing login page error on layout

Conflicts:
	app/assets/stylesheets/sufia.css.scss
	app/views/layouts/_homepage_sidebar2.html.erb