sua lung tung
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/application/language/KO-KR.xml
	src/application/views/cart/shipping.php
	src/application/views/product/details.php