Update admin by Mawin
Merge branch 'master' of https://github.com/intelhat/intranet

Conflicts:
	application/modules/admin/controllers/sharefile.php
	application/modules/admin/views/usertype/form.php
a