Merge branch 'MPS3.0'

Conflicts:
	languages/baseLanguage/baseLanguage/languageModels/behavior.mps
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/behavior/ClassifierType_Behavior.java
Rebuilt after conflict resolution
Merge remote-tracking branch 'origin/master' into 3.1/vaclavMerge