code format changed
MPS-19860 [build:MPS-135.917] no swap file: no swap file
MPS-19934 [build:MPS-135.944] run in EDT failure: Disposed events collector was called: class jetbrains.mps.nodeEditor.EditorComponent$MyEventsCollector
Merge remote-tracking branch 'origin/MPS3.1'

Conflicts:
	core/generator/source/jetbrains/mps/generator/TransientModelsModule.java