Clean up and developers test group
Adds staff test group
Merge branch 'master' into Issue7-Add_ds-user_delete

Conflicts:
	MBP_UserDigest.class.inc