Some minor mods to get tests back to passing after adding in Devise
All tests passing
CanCan WIP
Just updating schema.rb
Merge branch 'adjust-tests-for-devise' into group-view

Resolved Conflicts:
	app/views/contests/new.html.haml

Also added handling of songs by CanCan