Merge origin/master

Conflicts:
	application/views/admin/adminHome.php
Merge origin/master

Conflicts:
	libs/js/adminHome.js
Merge origin/master
done with registration form part 3 of admin