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
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 into C5_Mohab_468_Contest_Standings_5.25