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

Conflicts:
	src/application/language/VN-VI.xml