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

Conflicts:
	db/schema.rb
avoid subscribe to deleted topics 2