Merge branch 'diversity', remote-tracking branch 'origin' into diversity

Conflicts:
Fixed inconsitancies with logging out. Now takes you back to login page.
Now using Ajax call to User#ajaxDescription to fetch descriptions that are selected.
No longer have huge user stored in cookies. Just id
Even more JSON and AJAXy goodness. Now sending the entire JSON of the workshop to through ajax to register.
Merge branch 'diversity' of github.com:Dacilndak/eventreg into diversity

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/user_controller.rb
	app/views/layouts/application.html.erb
	app/views/user/login.html.erb
	app/views/user/register.html.erb
	db/schema.rb
	db/seeds.rb