Changed Status Controller
Merge branch 'master' of https://github.com/camcross/rafiki

Conflicts:
	app/views/courses/index.html.erb