New classifier scope is sort of here but turned off
Merge remote branch 'origin/master' into danya

Conflicts:
	languages/baseLanguage/baseLanguage/languageModels/behavior.mps
	languages/baseLanguage/baseLanguage/languageModels/constraints.mps
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.scopes/models/scopes.mps
Fix after merge
More work on classifiers scope
Better classifier resolving when several models with the same name exist
Deleted usages of TypeNameResolver in favor of scopes. Fixed building various solutions. Java parse tests fail
Java parsing based on proper classifier scopes. Parsing tests pass.
Merge branch 'danya'

Conflicts:
	languages/baseLanguage/baseLanguage/languageModels/behavior.mps
	languages/baseLanguage/baseLanguage/languageModels/constraints.mps
	languages/baseLanguage/baseLanguage/languageModels/structure.mps
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.scopes/models/scopes.mps
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/behavior/BehaviorAspectDescriptor.java
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/constraints/ConstraintsAspectDescriptor.java
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/structure/StructureAspectDescriptor.java
	plugins/mpsjava/basePlatform/models/newparser.mps
	plugins/mpsjava/testsol/models/jetbrains/mps/ide/java/tests/utility.mps
Re-generated
Trying to fix broken refs in models
More fixing broken refs in models
Classifier resolving: use old code after new code
Fixes in ASTConverters
Java import: support for super method calls
Java import: support for nested class direct import in classifier scopes
Fixed java import test. Fixed method comment import
Merge branch 'danya'
Re-generate after merge
Fixed model resolving in classifier resolver
Skipping transient models when resolving classifiers