add urls for update & delete
added update activity
fix merge conflict
added MOODLECONFIGFILE
Merge branch 'master' of https://github.com/canterburycollege/MyCPD2

Conflicts:
	system/Authentication.php