MEDIUM / Working on undo/redo features + working on
PameResourceModelFactory
Merge branch '1.7.0' of
ssh://git@github.com/openflexo-team/openflexo-core into 1.7.0

Conflicts:
	flexo-ui/src/main/java/org/openflexo/view/controller/FlexoController.java
Merge branch '1.7.0' of ssh://git@github.com/openflexo-team/openflexo-core into 1.7.0