MEDIUM / Fixed some compile issues
Merge branch '1.7' of
ssh://git@github.com/openflexo-team/openflexo-packaging.git into 1.7

Conflicts:
	integration-tests/src/test/java/org/openflexo/foundation/view/TestCityMappingView.java