just committed
just commit old code from other computer
Merge branch 'master' of https://github.com/huynhbathanh/cms

Conflicts:
	application/controllers/admin/page.php
	application/controllers/page.php
	application/views/components/footer.php
	application/views/page/admin/edit.php
	application/views/page/admin/index.php
	application/views/partials/admin_footer.php
	application/views/partials/admin_header.php
	application/views/partials/footer.php
	application/views/user/admin/create_group.php
	application/views/user/admin/create_user.php
	assets/js/jquery/jquery.slugify.js