Fixed some login stuff
Merge branch 'master' of https://github.com/markusberget/prnt

Conflicts:
	app/controllers/application_controller.rb
Changes to jobs listing
Merge branch 'master' of https://github.com/markusberget/prnt

Conflicts:
	app/views/layouts/application.html.erb