WIP updating course status
Merge branch 'integration' into feature/124-course_status
WIP updated failing specs
Add specs
Merge branch 'integration' into feature/124-course_status

Conflicts:
	app/controllers/courses_controller.rb
	spec/controllers/course_controller_spec.rb
Merge pull request #56 from aspett/feature/124-course_status

Feature/124 course status
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