fixing cproblem with contest progress
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140506131804_create_contest_progresses.rb
Merge pull request #469 from alaashafaee/dev_database

Dev database