Adding annotation and course_descriptions
Merge branch 'feature/additions_and_annotations' into staging

Conflicts:
	app/models/course.rb
	app/views/web/admin/courses/_form.html.haml
	config/locales/activerecord.ru.yml