MEDIUM / update viewpoint archimate
LOW / update archimate viewpoint
LOW / update archimate viewpoint
Merge branch 'master' of
ssh://git@github.com/openflexo-team/modelers.git

Conflicts:
	entreprisearchitecture/.project
	entreprisearchitecture/.settings/org.eclipse.core.resources.prefs
	entreprisearchitecture/.settings/org.eclipse.m2e.core.prefs