MEDIUM / Fixed OPENFLEXO-637
Merge branch '1.6' of ssh://git@github.com/agilebirds/openflexo into 1.6

Conflicts:
	flexodesktop/technologyadapters/pom.xml
MEDIUM / Fixed OPENFLEXO-637