#28 Friendly URL added for courses
Merge branch 'development' into master_issue_28

Conflicts:
	db/schema.rb
Merge branch 'master_issue_28' into development_feature_31