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

Conflicts:
	admin/products/add/multiple_insert_product/update.php
	admin/products/details/update.php
	confirm/index.php
	order/bag.php
	order/checkout.php
	order/finish.php
	order/login.php
	static/navbar.php