Resolve "update to changes in Main" Closes #18 See merge request RiseClipseGroup/RiseClipseMetamodel_NSD2016!17