NPE fix
Merge branch 'master' of https://github.com/metaborg/spoofax-modelware

Conflicts:
	org.spoofax.modelware.gmf/src/org/spoofax/modelware/gmf/EditorPairUtil.java