change the icon, update the admin function
Merge branch 'master' of https://github.com/partoneplay/hr360

Conflicts:
	test/test.php