Admin work. And staff change password functionality

Lots of admin work
Merge remote-tracking branch 'origin/master'

Conflicts:
	JS/Admin_Manage_Controls.js
Merge branch 'master' of https://github.com/TashPotatoes/STIMulate