Merge branch 'master' of https://github.com/canterburycollege/MyCPD2

Conflicts:
	views/activity/view.php