Issue #523 changing attrebutes
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140505095450_create_contests.rb