g
Merge branch 'master' of https://github.com/nickyudha/ayujewellery-new

Conflicts:
	admin/products/category/get.php
	admin/products/category/index.php
	admin/products/category/update.php
	admin/static/redirect.php