Sync
Merge branch 'master' of https://github.com/nickyudha/propanpaint

Conflicts:
	admin/custom/static/general.php
	products_/details.php