Task 1: unroll.
Merge branch 'Johnie-z-rest_courses'

Conflicts:
	modules/rest/index.php