Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/admin/controllers/brand.php
	application/modules/admin/controllers/category.php
	application/modules/admin/controllers/config.php
	application/modules/admin/controllers/product.php
	application/modules/admin/controllers/report.php
	application/modules/admin/controllers/user.php
	application/modules/admin/models/brand_model.php
	application/modules/admin/models/category_model.php
	application/modules/admin/models/product_model.php
	application/modules/admin/views/product/product_list.php
	application/modules/admin/views/templates/footer.php
	application/modules/admin/views/user/user_list.php
	public/css/jquery-ui.min.css