Combine related grants.
Handle deleted questions when showing submissions.
Check that the user exists before displaying.
Make sure when we try to edit the class attribute it is not nil.
Allow students to edit their comments and annotations.
Update LICENSE
Merge branch 'master' of github.com:Coursemology/coursemology.org
Fix downloading of folders with restricted characters in them (e.g. virtual folders)
Fix wrong identifier reference.
For the survey questions controller, index is not defined.
Merge remote-tracking branch 'origin' into development

Conflicts:
	app/controllers/training_submissions_controller.rb
better alignment for manage students page
migration, add pending_deletion for user and course table
add delete user background job
flash error in layout page
filter user by role, and user removal
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_dev
Merge branch 'development' of github.com:Coursemology/coursemology.org into Deploy
precompiled assets