Merge branch 'extra_propal' into extrafields
Merge branch 'extra_invoice' into extrafields

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Fix : select correct value of extrafield (select list)
Merge branch 'extrafields' into fgd