resolve conflicts
Merge branch 'dev' of github.com:horx/xms into dev

Conflicts:
	application/controllers/cpanel/cat.php
	application/models/users.php
	application/views/home/index.php