v3
Merge branch 'master' of https://github.com/BeautyNista/nista

Conflicts:
	application/config/database.php
	application/modules/admin/models/product_type.php
	application/modules/admin/models/product_type_detail.php
	application/modules/admin/views/product_type/form.php
	application/modules/admin/views/user/permission.php
	application/modules/admin/views/user_group/permission.php
	application/modules/admin/views/user_type/permission.php
	themes/admin/assets/css/dashboard.css
	themes/admin/views/layouts/index.php