Modified routing to put more specific routes before less specific ones
Merge branch 'develop' of https://github.com/unikent/of-course into develop

Conflicts:
	public/index.php