migrate SModel (ChangeSet)
make
migrate SModel (ChangeSetImpl)
migrate SModel (changes)
migrate SModel (MetadataUtil)
migrate SModel (MergeSession)
migrate SModel
migrate SModel
Merge branch 'master' into 3.0/mikev/test

Conflicts:
	plugins/vcs-core/core/models/diff/merge.mps
	plugins/vcs/common/models/changesmanager.mps
	plugins/vcs/common/models/changesmanager/editor.mps
	plugins/vcs/common/models/diff/ui.mps
	plugins/vcs/common/models/diff/ui/common.mps
	plugins/vcs/common/models/diff/ui/merge.mps
	plugins/vcs/common/source_gen/jetbrains/mps/vcs/diff/ui/MetadataUtil.java
	plugins/vcs/models/jetbrains/mps/vcs/changesmanager/tree.mps
	plugins/vcs/models/jetbrains/mps/vcs/changesmanager@tests.mps
	plugins/vcs/models/jetbrains/mps/vcs/diff/merge@tests.mps
make
migrate SModel (editing)
Merge remote-tracking branch 'origin/master' into 3.0/mikev/test

Conflicts:
	plugins/vcs/common/models/diff/ui/common.mps
make
DiffTemporaryModule
DiffTemporaryModule
eliminate DiffTemporaryModule
do not use TemporaryModels
rename old model in ChangesTracking
Merge remote-tracking branch 'origin/master' into 3.0/mikev/test
Merge remote-tracking branch 'origin/master' into 3.0/mikev/test