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

Conflicts:
	application/modules/admin/models/product.php
Merge branch 'master' of https://github.com/BeautyNista/nista