git
Merge branch 'master' of https://github.com/nickyudha/melissamelissa

Conflicts:
	product/details.php