gensources.iml updated by IDEA
MPS-17859 [build:MPS-117.9448] jetbrains.mps.smodel.IllegalModelAccessError : accessing disposed model: accessing disposed model
MPS-15100 [build:IU-103.SNAPSHOT] jetbrains.mps.smodel.IllegalModelAccessError : accessing disposed model: accessing disposed model
increasing permgen size for ProjectTest
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors
correcting ClassifierResolveUtils in order to NOT resolve reference if there are more then one element with specified resolve info available in this scope.
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors

Conflicts:
	tools/gensources/gensources.iml
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors
gensources.iml commited
Reverting changes in ClassifierResolveUtils leading to unit-test problems
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors

Conflicts:
	tools/gensources/gensources.iml
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors
reverting changes in ClassifierResolveUtils
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors
Merge remote-tracking branch 'origin/master' into 3.0/multipleEditors
rebuilding models after merge