resend
Merge branch 'develop' of https://github.com/hopitio/e-com into develop

Conflicts:
	src/application/config/routes_portal.php
	src/application/language/EN-US.xml
	src/application/language/KO-KR.xml
	src/application/language/VN-VI.xml