Refactoring/decomposing State
Merge remote branch 'origin/master' into fisakov/types
Merge remote branch 'origin/master' into fisakov/types
Using the correct state class
Strict typing for typechecking implementation
Trying to reuse typechecking context for the generation
Some renaming/repackaging in the typechecker
Rolled back the changes for the cached typechecking during generation
Merge remote branch 'origin/master' into fisakov/types
Rebuilt project MPS
Removed bad assert
Getting rid of the "isResolveMode" flag
Fixed the import
Merge remote branch 'origin/master' into fisakov/types

Conflicts:
	.idea/compiler.xml
	core/ant/source_gen.caches/jetbrains/mps/build/ant/generated
	core/ant/source_gen.caches/jetbrains/mps/build/ant/make/generated
	core/generator/solutions/traceInfo/util/source_gen.caches/jetbrains/mps/generator/traceInfo/generated
	core/generator/source_gen.caches/jetbrains/mps/generator/impl/generated
	core/kernel/source_gen.caches/jetbrains/mps/util/generated
	core/make-runtime/solutions/jetbrains.mps.make.runtime/source_gen.caches/jetbrains/mps/make/generated
	core/persistence/source_gen.caches/jetbrains/mps/smodel/persistence/def/v7/generated
	core/tool/ant/source_gen.caches/jetbrains/mps/build/ant/generation/generated
	core/tool/builder/source_gen.caches/jetbrains/mps/tool/builder/check/generated
	core/tool/builder/source_gen.caches/jetbrains/mps/tool/builder/make/generated
	core/tool/common/source_gen.caches/jetbrains/mps/tool/common/util/generated
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.scopes/source_gen.caches/jetbrains/mps/baseLanguage/scopes/generated
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.search/source_gen.caches/jetbrains/mps/baseLanguage/search/generated
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/source_gen.caches/jetbrains/mps/baseLanguage/util/generated
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/source_gen.caches/jetbrains/mps/baseLanguage/util/plugin/refactorings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/dataFlow/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/editor/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/closures/util/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/intentions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/typesystem/generated
	languages/baseLanguage/baseLanguage/tests_gen.caches/jetbrains/mps/baseLanguage/test/generated
	languages/baseLanguage/baseLanguageInternal/source_gen.caches/jetbrains/mps/baseLanguageInternal/intentions/generated
	languages/baseLanguage/checkDot/languages/checkedDots/source_gen.caches/jetbrains/mps/baseLanguage/checkedDots/intentions/generated
	languages/baseLanguage/classifiers/source_gen.caches/jetbrains/mps/baseLanguage/classifiers/intentions/generated
	languages/baseLanguage/closures/source_gen.caches/jetbrains/mps/baseLanguage/closures/intentions/generated
	languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/intentions/generated
	languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/intentions/generated
	languages/baseLanguage/logging/source_gen.caches/jetbrains/mps/baseLanguage/logging/generator/baseLanguage/template/main/generated
	languages/baseLanguage/logging/source_gen.caches/jetbrains/mps/baseLanguage/logging/intentions/generated
	languages/baseLanguage/unitTest/solutions/sandbox/source_gen.caches/jetbrains/mps/baseLanguage/unitTest/sandbox/generated
	languages/baseLanguage/unitTest/source_gen.caches/jetbrains/mps/baseLanguage/unitTest/intentions/generated
	languages/core/core/source_gen.caches/jetbrains/mps/lang/core/intentions/generated
	languages/languageDesign/access/source_gen.caches/jetbrains/mps/lang/access/intentions/generated
	languages/languageDesign/actions/source_gen.caches/jetbrains/mps/lang/actions/generator/baseLanguage/template/main/generated
	languages/languageDesign/behavior/languages/behavior/source_gen.caches/jetbrains/mps/lang/behavior/intentions/generated
	languages/languageDesign/constraints/source_gen.caches/jetbrains/mps/lang/constraints/generator/baseLanguage/template/main/generated
	languages/languageDesign/dataFlow/source_gen.caches/jetbrains/mps/lang/dataFlow/intentions/generated
	languages/languageDesign/editor/languages/editorTest/source_gen.caches/jetbrains/mps/lang/editor/editorTest/intentions/generated
	languages/languageDesign/editor/source_gen.caches/jetbrains/mps/lang/editor/intentions/generated
	languages/languageDesign/generator/languages/templateLanguage/solutions/pluginSolution/source_gen.caches/jetbrains/mps/lang/generator/pluginSolution/plugin/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/generator/baseLanguage/template/main/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/intentions/generated
	languages/languageDesign/intentions/source_gen.caches/jetbrains/mps/lang/intentions/intentions/generated
	languages/languageDesign/make/languages/script/source_gen.caches/jetbrains/mps/make/script/generator/template/main/generated
	languages/languageDesign/make/languages/script/source_gen.caches/jetbrains/mps/make/script/intentions/generated
	languages/languageDesign/make/solutions/jetbrains.mps.make.sandbox/source_gen.caches/jetbrains/mps/make/sandbox/icons/generated
	languages/languageDesign/pattern/source_gen.caches/jetbrains/mps/lang/pattern/intentions/generated
	languages/languageDesign/plugin-standalone/source_gen.caches/jetbrains/mps/lang/plugin/standalone/generator/template/main/generated
	languages/languageDesign/plugin/source_gen.caches/jetbrains/mps/lang/plugin/generator/baseLanguage/template/main/generated
	languages/languageDesign/plugin/source_gen.caches/jetbrains/mps/lang/plugin/intentions/generated
	languages/languageDesign/plugin/source_gen.caches/jetbrains/mps/lang/plugin/scripts/generated
	languages/languageDesign/quotation/source_gen.caches/jetbrains/mps/lang/quotation/intentions/generated
	languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/intentions/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/intentions/generated
	languages/languageDesign/stubs/source_gen.caches/jetbrains/mps/lang/stubs/generator/template/main/generated
	languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/intentions/generated
	languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/intentions/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/intentions/generated
	languages/modelmetadata/source_gen.caches/jetbrains/mps/ide/vcs/modelmetadata/structure/generated
	languages/util/builders/source_gen.caches/jetbrains/mps/baseLanguage/builders/intentions/generated
	languages/util/buildlanguage/languages/gentest/source_gen.caches/jetbrains/mps/build/gentest/plugin/generated
	languages/util/contracts/languages/contracts/source_gen.caches/jetbrains/mps/baseLanguage/contracts/intentions/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/intentions/generated
	languages/util/ideUiLanguage/source_gen.caches/jetbrains/mps/ide/uiLanguage/generator/baseLanguage/template/main/generated
	languages/util/math/source_gen.caches/jetbrains/mps/baseLanguage/math/intentions/generated
	languages/util/regexp/source_gen.caches/jetbrains/mps/baseLanguage/regexp/intentions/generated
	languages/util/ui/languages/meta/source_gen.caches/jetbrains/mps/ui/modeling/intentions/generated
	languages/util/uiLanguage/source_gen.caches/jetbrains/mps/uiLanguage/intentions/generated
	languages/util/xml/xml/source_gen.caches/jetbrains/mps/xml/intentions/generated
	languages/util/xml/xmlSchema/source_gen.caches/jetbrains/mps/xmlSchema/intentions/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/intentions/generated
	plugins/debugger-api/languages/jetbrains.mps.debugger.api.lang/source_gen.caches/jetbrains/mps/debugger/api/lang/generator/template/generator/template/main/generated
	plugins/debugger-api/languages/jetbrains.mps.debugger.api.lang/source_gen.caches/jetbrains/mps/debugger/api/lang/intentions/generated
	plugins/debugger-api/languages/nanoc/pluginSolution/source_gen.caches/jetbrains/mps/nanoc/debug/breakpoints/generated
	plugins/debugger-api/languages/nanoc/pluginSolution/source_gen.caches/jetbrains/mps/nanoc/debug/generated
	plugins/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/actions/generated
	plugins/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/generated
	plugins/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/tool/generated
	plugins/debugger-java/api/source_gen.caches/jetbrains/mps/debug/generated
	plugins/debugger-java/api/source_gen.caches/jetbrains/mps/debugger/java/api/evaluation/generated
	plugins/debugger-java/api/source_gen.caches/jetbrains/mps/debugger/java/api/evaluation/proxies/generated
	plugins/debugger-java/languages/customViewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/generator/template/generator/template/main/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/configurations/remote/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/engine/concurrent/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/engine/requests/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/evaluation/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/evaluation/model/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/evaluation/proxies/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/state/values/generated
	plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/ui/actions/generated
	plugins/execution-api/languages/settings/source_gen.caches/jetbrains/mps/execution/settings/generator/template/main/generated
	plugins/execution-api/languages/settings/source_gen.caches/jetbrains/mps/execution/settings/intentions/generated
	plugins/execution-api/source_gen.caches/jetbrains/mps/execution/api/configurations/generated
	plugins/execution-api/source_gen.caches/jetbrains/mps/plugins/pluginparts/runconfigs/generated
	plugins/execution-configurations/languages/ant/source_gen.caches/jetbrains/mps/ant/execution/generated
	plugins/execution-configurations/languages/baseLanguage/jetbrains.mps.baseLanguage.execution.api/source_gen.caches/jetbrains/mps/baseLanguage/execution/api/generated
	plugins/execution-configurations/languages/baseLanguage/jetbrains.mps.baseLanguage.execution.api/source_gen.caches/jetbrains/mps/baseLanguage/execution/api/ui/generated
	plugins/execution-configurations/languages/plugin/source_gen.caches/jetbrains/mps/execution/configurations/implementation/plugin/plugin/generated
	plugins/execution-configurations/languages/unitTests/runtime/source_gen.caches/jetbrains/mps/baseLanguage/unitTest/execution/client/generated
	plugins/execution-configurations/languages/unitTests/runtime/source_gen.caches/jetbrains/mps/baseLanguage/unitTest/execution/settings/generated
	plugins/execution-configurations/languages/unitTests/runtime/source_gen.caches/jetbrains/mps/baseLanguage/unitTest/execution/tool/generated
	plugins/execution-languages/languages/commands/source_gen.caches/jetbrains/mps/execution/commands/intentions/generated
	plugins/execution-languages/languages/configurations/source_gen.caches/jetbrains/mps/execution/configurations/generator/template/main/generated
	plugins/execution-languages/languages/deprecated.runtime/source_gen.caches/jetbrains/mps/execution/configurations/deprecated/runtime/generated
	plugins/execution-languages/languages/deprecated/source_gen.caches/jetbrains/mps/execution/configurations/deprecated/generator/template/main/generated
	plugins/execution-languages/languages/deprecated/source_gen.caches/jetbrains/mps/execution/configurations/deprecated/plugin/generated
	plugins/execution-languages/languages/jetbrains.mps.execution.impl/source_gen.caches/jetbrains/mps/execution/impl/configurations/generated
	plugins/execution-languages/languages/jetbrains.mps.execution.impl/source_gen.caches/jetbrains/mps/execution/impl/configurations/runners/generated
	plugins/execution-languages/languages/jetbrains.mps.execution.sandbox/source_gen.caches/jetbrains/mps/execution/sandbox/sandbox/generated
	plugins/execution-languages/languages/library/source_gen.caches/jetbrains/mps/execution/lib/generated
	plugins/migration25/source_gen.caches/jetbrains/mps/ide/migration/migration25/generated
	plugins/modelchecker/solution/modelchecker/actions.mps
	plugins/modelchecker/source_gen.caches/jetbrains/mps/ide/modelchecker/actions/generated
	plugins/mps-build/languages/bash/source_gen.caches/jetbrains/mps/bash/intentions/generated
	plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/intentions/generated
	plugins/mps-build/languages/build/source_gen.caches/jetbrains/mps/build/intentions/generated
	plugins/mps-build/languages/solutions/jetbrains.mps.build.sandbox/source_gen.caches/jetbrains/mps/build/sandbox/testExternalBuild/generated
	plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/source_gen.caches/jetbrains/mps/build/mps/pluginSolution/plugin/generated
	plugins/mps-core/languages/core.xml.sax/source_gen.caches/jetbrains/mps/core/xml/sax/intentions/generated
	plugins/mps-obsolete/languages/buildlanguage/source_gen.caches/jetbrains/mps/buildlanguage/intentions/generated
	plugins/mps-obsolete/languages/packaging/source_gen.caches/jetbrains/mps/build/packaging/intentions/generated
	plugins/mps-obsolete/languages/solutions/jetbrains.mps.buildlanguage.execution/source_gen.caches/jetbrains/mps/build/deprecated/execution/generated
	plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/actions/generated
	plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/newparser/generated
	plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/parser/generated
	plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/platform/highlighters/generated
	plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/sourceStubs/generated
	plugins/mpsjava/testsol/source_gen.caches/jetbrains/mps/ide/java/tests/utility/generated
	plugins/mpsjava/testsol/test_gen.caches/jetbrains/mps/ide/java/tests/realCode/generated
	plugins/mpsjava/workbench/source_gen.caches/jetbrains/mps/ide/java/workbench/actions/generated
	plugins/mpsmake/source_gen.caches/jetbrains/mps/ide/make/actions/generated
	plugins/vcs-core/core/source_gen.caches/jetbrains/mps/vcs/core/mergedriver/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/changesmanager/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/diff/ui/common/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/diff/ui/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/platform/actions/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/platform/integration/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/platform/mergedriver/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/platform/util/generated
	plugins/vcs/source_gen.caches/jetbrains/mps/vcs/actions/generated
	plugins/vcs/source_gen.caches/jetbrains/mps/vcs/changesmanager/tree/generated
	plugins/vcs/source_gen.caches/jetbrains/mps/vcs/plugin/generated
	plugins/vcs/test_gen.caches/jetbrains/mps/vcs/changesmanager/generated
	plugins/vcs/test_gen.caches/jetbrains/mps/vcs/generated
	samples/sampleJavaExtensions/languages/ParallelFor/source_gen.caches/org/jetbrains/mps/samples/ParallelFor/intentions/generated
	samples/sampleJavaExtensions/languages/SampleExtensions/source_gen.caches/org/jetbrains/mps/samples/IfAndUnless/intentions/generated
	samples/sampleJavaExtensions/solutions/Build/source_gen.caches/org/jetbrains/mps/samples/Build/build/generated
	testbench/languages/source_gen.caches/jetbrains/mps/testbench/suite/intentions/generated
	workbench/mps-debugger/source_gen.caches/jetbrains/mps/debugger/core/generated
	workbench/mps-editor/source_gen.caches/jetbrains/mps/ide/editor/util/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/actions/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/vcs/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/boundpanels/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/lists/generated
Re-resolved refs to org.jetbrains.annotations.*
Removed obsolete imports of org.jetbrains.annotations
Added dependency MPS.OpenAPI on MPS.Core
Removed global subtyping cache
Removed obsolete imports of org.jetbrains.annotations; fixing annotations
Removed unused code