fix conflict
fix adminManager
fix adminManager
fix routing after delete & update
rename adminManager to admin
fix typos in manager
Merge master into manager

Conflicts:
	system/formHelper.php