Removed unmaintaned OScommerce module
Use language to find template email.
Qual: Indentation muse be done with css and not using multiple &nbsp;
spaces.
Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
Merge branch 'GPCsolutions-droposcommerce' into develop
Add legend on peruser view.
Merge remote-tracking branch 'Upstream/develop' into develop-patch1