MPS-20291 Null references kill editor cells
Merge remote-tracking branch 'origin/MPS3.1' into 3.1/editorBugfixes
Merge remote-tracking branch 'origin/MPS3.1' into 3.1/editorBugfixes
rebuilding after merge
MPS-18659 Editor is not focused after creating a new aspect
MPS-20330 extra rebuildEditorContent() is called on opening any MPS editor
MPS-20333 No error on creating concept members with the same name
MPS-20312 Wrong behavior on undo newly added property/link declaration after renaming existing property/link declaration
Merge remote-tracking branch 'origin/MPS3.1' into 3.1/editorBugfixes
regenerating after merge
MPS-20347 - enabled attracting focus on an empty type cell, updated the selection managers for IncompleteMember's substitutions
MPS-20347 - corrected expected cursor position in test
Merge remote-tracking branch 'origin/MPS3.1'

Conflicts:
	editor/editor-runtime/source/jetbrains/mps/nodeEditor/cells/EditorCell_Property.java
Merge branch 'master' of ssh+git://git.labs.intellij.net/mps/mps