QuckFix for FieldReferece -> ArrayLengthOperataion (currently disabled because of StackOverflow)
Do not show "import language" diealog on model metadata merging
Resolving methods and fields by static imports.
Classes and enum constants not done yet.
QuickFix for removing java import annotations which are not needed any longer
fix memory leak in settings
Removed log.error when dynamic reference has target model null
Removing leading * in javadoc comments
Skipping extra space in java comments
Parsing comments better
Parsing hex literals
Fixed one parsing test
change layout manager in mps project properties dialog/settings
Merge branch 'danya'

Conflicts:
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.scopes/models/scopes.mps
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.scopes/source_gen/jetbrains/mps/baseLanguage/scopes/ClassifierResolveUtils.java
Resolve conflicts and re-generate
Merge remote-tracking branch 'origin/master' into mvtest30
Merge branch 'master' into victor/bugs
Merge branch 'mvtest30'