security fix: user login over privileges
Merge branch 'master' of https://github.com/xianglei/phpHiveAdmin

Conflicts:
	application/models/user_model.php