added support for simple omniauth support against CAS
Merge branch 'master' of github.com:Det-Kongelige-Bibliotek/DIAS

Conflicts:
	hydra_head/app/controllers/application_controller.rb
Merge branch 'master' of github.com:Det-Kongelige-Bibliotek/DIAS
a small rollback on the login part
Merge branch 'master' of github.com:Det-Kongelige-Bibliotek/DIAS
initial commit on getting cancan stuff to work
Merge branch 'master' of github.com:Det-Kongelige-Bibliotek/DIAS
deleted old stuff
merge from old DIAS project
merge from old DIAS project
merge from old DIAS project
Merge branch 'master' of github.com:Det-Kongelige-Bibliotek/DIAS

Conflicts:
	app/assets/stylesheets/blacklight.css.scss
	app/views/_user_util_links.html.erb
Merge remote-tracking branch 'origin/master'

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