schema update
Merge branch 'development' of github.com:Coursemology/coursemology.org into development

Conflicts:
	db/schema.rb
avoid subscribe to deleted topics 2
improved missions page
make leader board page cleaner
fix enrollment request: approve / delete selected
clicking on training options selects the checkbox
style training page
improvements to training page
increased font size for profile name
comment box tweaks
Revert "comment box tweaks"

This reverts commit df96d6bf0c479e418a7452a5ea72b82b3f43190e.
fixed issue of annotation not appearing
Revert "Revert "comment box tweaks""

This reverts commit 13612349501a7db1b8dbff174628730dc513642d.
Tweaked inline commenting box
enable html edit for textarea
mass enrolment
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond

Conflicts:
	app/models/comment_subscription.rb
sidebar 10px wider
recompiled assets