Changed course controller to courses controller
Merge branch 'integration' into hotfix/85-course_controller

Conflicts:
	config/routes.rb
Merge branch 'hotfix/85-course_controller' into integration