AdhocOfficer Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	4.0.1/inc/js/pages/js.adhocOfficer.js