Category controller
Merge branch 'master' of https://github.com/daobv/raovat
Merge branch 'master' of https://github.com/daobv/raovat

Conflicts:
	application/backend/controllers/Category_controller.php