User notification uppon canceling of presentation
Merge branch 'master' of github.com:Samfundet/Bedpres
added email verification for new accounts
updated partial render to non-deprecated method
updated annotations
Merge branch 'master' of github.com:Samfundet/Bedpres

Conflicts:
	app/views/sessions/new.html.haml
link in the flash message for the canceled presentation
Merge branch 'master' of github.com:Samfundet/Bedpres

Conflicts:
	db/schema.rb
Updated Rails from 3.2.10 to 3.2.11.
authenticate now throws exception on login with unvalidated accounts
Removed patch for CVE-2013-0156.

After upgrading to Rails 3.2.11, the quick fix for CVE-2013-0156 is not
necessary. This upgrade also solves CVE-2013-0155.
Merge branch 'master' of github.com:Samfundet/Bedpres
Removed output of static serving i Webrick.
Can remove notification box about cancelled presentation
Merge branch 'master' of github.com:Samfundet/Bedpres
only validate users in production
Merge branch 'master' of github.com:Samfundet/Bedpres

Conflicts:
	app/models/user.rb
Merge branch 'master' of github.com:Samfundet/Bedpres into polymorphic-associations

Conflicts:
	app/models/user.rb
	db/schema.rb
Notification can now belong to a Member.