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

Conflicts:
	products_/details.php
	products_/index.php