Update schema.
Test for assignment of @concept_progresses in ConceptsController.
Merge branch 'master' of github.com:graspapp/grasp

Conflicts:
	db/schema.rb
Set a specific Ruby version.
Merge branch 'master' of heroku.com:graspapp