Add favorite button into country dictionary to put value on top select list
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
Merge remote-tracking branch 'Upstream/develop' into develop-favorite

Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Merge branch 'aspangaro-develop-favorite' into develop