Editing login page
Merge branch 'master' of github.com:hegemonia/dibstarter

Conflicts:
	app/assets/stylesheets/default.css.scss
Removing defaults again