Fix the whole devise and admins and everythings
Merge branch 'master' of github.com:ZeusWPI/Tab

Conflicts:
	app/assets/stylesheets/application.css.scss