Removed unmaintaned OScommerce module
Fix: area to generate doc must use half size not onethird.
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
New: Add number of active notification into tab title (like we do for
notes and documents)
Better contrast
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Qual: Removed a lot of duplicate code
New: extrafields for projects and tasks are exported to ODT documents.
Add index on new table llx_c_email_template
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.
Clean code
Fix: table name differs.
Merge remote-tracking branch 'Upstream/develop' into develop-accounting