removed depricated migration outside of db/migration folder. Regenerated schema.rb because of merge conflicts.
Merge branch 'master' of https://github.com/auditoriumCS/auditorium