Properly render images and non-markdown content.
Refactor application to use CanCan for authorization
Fix location of code coverage token.
Correct code coverage! Woo!
Instructor views course as student
Students should be able to update their pictures from their profile
page.
Bumpe Rails
Bump other outdated gems
Instructors now view courses index by default.
Fix: "add new event" button should not be visible for non-instructors
Users see course navigation when viewing profiles
Merge branch 'master' into dev

* master:
  Users see course navigation when viewing profiles
  Fix: "add new event" button should not be visible for non-instructors
  Instructors now view courses index by default.
  Bump other outdated gems
  Bumpe Rails
  Students should be able to update their pictures from their profile page.
  Instructor views course as student
  Correct code coverage! Woo!
  Fix location of code coverage token.
  Refactor application to use CanCan for authorization
  Properly render images and non-markdown content.

Conflicts:
	app/views/enrollments/index.html.haml
	app/views/users/show.html.haml