LOW : merge origin/1.6 with excelconnector
Merge branch '1.6' of github.com:agilebirds/openflexo into 1.6

Conflicts:
	flexodesktop/technologyadapters/excelconnector-ui/src/main/java/org/openflexo/technologyadapter/excel/gui/ExcelBasicModelBrowser.java
Merge remote-tracking branch 'origin/1.6' into 1.6
merge from origin/1.6 to local 1.6
LOW: fix compilation issue