Set same icon status rule as for thirdparty
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
Extrafield : better filter on select from table management for
extrafields table
Fix: translation
Merge pull request #1282 from grandoc/develop

fix : language
Merge branch 'develop' of https://github.com/FHenry/dolibarr into
FHenry-develop

Conflicts:
	htdocs/core/class/extrafields.class.php
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Merge branch 'upstream/develop'
Changelog & lang en_US for Skype module
Merge pull request #1283 from aspangaro/develop

Changelog & lang en_US for Skype module
fix: minor syntax rules