Refined course page
Merge branch 'integration' into feature/126-course_layout

Conflicts:
	app/controllers/courses_controller.rb
	app/views/courses/_tm_form.html.erb
	app/views/courses/show.html.erb
Merge branch 'integration' into feature/126-course_layout

Conflicts:
	app/assets/stylesheets/course.css.scss
Merge branch 'feature/126-course_layout' into integration