fixx tree
Merge branch 'Dev_Pront-end' of https://github.com/cambeme/vnpt-qavah into Dev_Pront-end

Conflicts:
	application/controllers/jstree_manage_domain_device_controller.php
	assets/js/custom/manage/mytree_domain_device.js