Rebuilt generictasks
Merge remote-tracking branch 'remotes/origin/master' into scrum/RemoveWorkbenchDependencies

Conflicts:
	build/MPS-compile.xml
	languages/baseLanguage/baseLanguage/languageModels/intentions.mps
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/intentions/dependencies
	languages/util/buildlanguage/solutions/jetbrains.mps.buildlangauge.mpsautobuild/jetbrains/mps/build/mpsautobuild.mps
	languages/util/buildlanguage/solutions/jetbrains.mps.buildlangauge.mpsautobuild/source_gen/jetbrains/mps/build/mpsautobuild/MPS-compile.xml
	plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/breakpoints.mps
include asm.jar into MPS.Core, remove from baseLanguage; regenerate
Merge remote branch 'origin/master' into feature/88_make_integration

Conflicts:
	IdeaPlugin/.idea/runConfigurations/AllTests_from_plugin.xml
	IdeaPlugin/mps-core/testSrc/jetbrains/mps/idea/core/tests/EditorTests.java
	core/kernel/source_gen.caches/jetbrains/mps/kernel/model/generated
	core/kernel/source_gen.caches/jetbrains/mps/scope/generated
	core/kernel/source_gen.caches/jetbrains/mps/smodel/generated
	core/kernel/source_gen.caches/jetbrains/mps/smodel/persistence/def/v7/generated
	core/kernel/source_gen.caches/jetbrains/mps/util/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/actions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/constraints/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/findUsages/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/closures/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/closures/util/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/conceptFunctionDefaults/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/strings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/intentions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/plugin/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/refactorings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/scripts/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/stubs/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/textGen/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/util/plugin/refactorings/generated
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/textGen/trace.info
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/util/plugin/refactorings/trace.info
	languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/behavior/generated
	languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/editor/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/findUsages/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generator_new/baseLanguage/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generator_new/util/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/intentions/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/refactorings/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/scripts/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/typesystem/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/editor/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/generator/baseLanguage/template/genUtil/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/generator/baseLanguage/template/main/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/intentions/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/scripts/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/typesystem/generated
	languages/languageDesign/typesystem/source_gen/jetbrains/mps/lang/typesystem/constraints/trace.info
	languages/util/buildlanguage/ant/source_gen/jetbrains/mps/build/ant/trace.info
	languages/util/buildlanguage/languages/generictasks/source_gen.caches/jetbrains/mps/build/generictasks/generator/template/main/generated
	languages/util/buildlanguage/languages/generictasks/source_gen.caches/jetbrains/mps/build/generictasks/taskfromjar/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/actions/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/editor/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/generator/baseLanguage/template/main/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/generator/baseLanguage/template/util/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/intentions/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/typesystem/generated
	languages/util/dates/source_gen/jetbrains/mps/baseLanguage/dates/constraints/trace.info
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/actions/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/editor/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/generator/baseLanguage/template/generic/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/generator/baseLanguage/template/main/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/intentions/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/typesystem/generated
	plugins/execution-languages/tests/test_gen.caches/jetbrains/mps/execution/impl/configurations/tests/commands/generated
	testbench/solutions/jetbrains.mps.testbench.make.msd
	testbench/tests_gen.caches/jetbrains/mps/tests/generated
	testbench/tests_gen/jetbrains/mps/tests/trace.info
Made project MPS
regenerate actions aspects
Merge MPS 2.0 into 2.1
fix problem with duplicated imports in module
regenerate modules
Merge remote-tracking branch 'origin/master' into scrum/editorActions

Conflicts:
	languages/languageDesign/plugin/source_gen/jetbrains/mps/lang/plugin/generator/baseLanguage/template/main/QueriesGenerated.java
Merge remote branch 'origin/master' into feature/88_make_integration

Conflicts:
	IdeaPlugin/build.xml
	IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/facet/MPSConfigurationBean.java
	core/analyzers/languages/analyzers/source_gen.caches/jetbrains/mps/analyzers/behavior/generated
	core/ant/source_gen.caches/jetbrains/mps/build/ant/generated
	core/ant/source_gen.caches/jetbrains/mps/build/ant/generation/workers/generated
	core/ant/source_gen/jetbrains/mps/build/ant/trace.info
	core/kernel/source/jetbrains/mps/library/ModulesMiner.java
	core/kernel/source/jetbrains/mps/project/structure/modules/ModuleDescriptor.java
	core/kernel/source_gen.caches/jetbrains/mps/kernel/model/generated
	core/kernel/source_gen.caches/jetbrains/mps/refactoring/generated
	core/kernel/source_gen/jetbrains/mps/kernel/model/trace.info
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/behavior/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/stubs/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/textGen/generated
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/textGen/trace.info
	languages/baseLanguage/baseLanguageInternal/source_gen.caches/jetbrains/mps/baseLanguageInternal/behavior/generated
	languages/baseLanguage/baseLanguageInternal/source_gen.caches/jetbrains/mps/baseLanguageInternal/constraints/generated
	languages/baseLanguage/blTypes/source_gen.caches/jetbrains/mps/baseLanguage/blTypes/behavior/generated
	languages/baseLanguage/blTypes/source_gen.caches/jetbrains/mps/baseLanguage/blTypes/constraints/generated
	languages/baseLanguage/checkDot/languages/checkedDots/source_gen.caches/jetbrains/mps/baseLanguage/checkedDots/behavior/generated
	languages/baseLanguage/classifiers/source_gen.caches/jetbrains/mps/baseLanguage/classifiers/behavior/generated
	languages/baseLanguage/closures/source_gen.caches/jetbrains/mps/baseLanguage/closures/behavior/generated
	languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/behavior/generated
	languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/constraints/generated
	languages/baseLanguage/constructors/source_gen.caches/jetbrains/mps/baseLanguage/constructors/behavior/generated
	languages/baseLanguage/jdk7/languages/jdk7/source_gen.caches/jetbrains/mps/baseLanguage/jdk7/behavior/generated
	languages/baseLanguage/logging/source_gen.caches/jetbrains/mps/baseLanguage/logging/behavior/generated
	languages/baseLanguage/overloadedOperators/languages/overloadedOperators/source_gen.caches/jetbrains/mps/baseLanguage/overloadedOperators/behavior/generated
	languages/baseLanguage/tuples/languages/tuples/source_gen.caches/jetbrains/mps/baseLanguage/tuples/behavior/generated
	languages/baseLanguage/tuples/languages/tuples/source_gen.caches/jetbrains/mps/baseLanguage/tuples/constraints/generated
	languages/baseLanguage/unitTest/source_gen.caches/jetbrains/mps/baseLanguage/unitTest/behavior/generated
	languages/baseLanguage/unitTest/source_gen.caches/jetbrains/mps/baseLanguage/unitTest/constraints/generated
	languages/languageDesign/actions/source_gen.caches/jetbrains/mps/lang/actions/behavior/generated
	languages/languageDesign/behavior/languages/behavior/source_gen.caches/jetbrains/mps/lang/behavior/behavior/generated
	languages/languageDesign/constraints/source_gen.caches/jetbrains/mps/lang/constraints/behavior/generated
	languages/languageDesign/constraints/source_gen.caches/jetbrains/mps/lang/constraints/constraints/generated
	languages/languageDesign/dataFlow/source_gen.caches/jetbrains/mps/lang/dataFlow/behavior/generated
	languages/languageDesign/dataFlow/source_gen.caches/jetbrains/mps/lang/dataFlow/constraints/generated
	languages/languageDesign/editor/languages/table/source_gen.caches/jetbrains/mps/lang/editor/table/behavior/generated
	languages/languageDesign/editor/source_gen.caches/jetbrains/mps/lang/editor/behavior/generated
	languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/behavior/generated
	languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/constraints/generated
	languages/languageDesign/findUsages/source_gen.caches/jetbrains/mps/lang/findUsages/behavior/generated
	languages/languageDesign/generator/languages/generationContext/source_gen.caches/jetbrains/mps/lang/generator/generationContext/behavior/generated
	languages/languageDesign/generator/languages/generationContext/source_gen.caches/jetbrains/mps/lang/generator/generationContext/constraints/generated
	languages/languageDesign/generator/languages/generationParameters/source_gen.caches/jetbrains/mps/lang/generator/generationParameters/behavior/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/behavior/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/constraints/generated
	languages/languageDesign/generator/test/inputLang/source_gen.caches/jetbrains/mps/transformation/test/inputLang/behavior/generated
	languages/languageDesign/generator/test/outputLang/source_gen.caches/jetbrains/mps/transformation/test/outputLang/behavior/generated
	languages/languageDesign/intentions/source_gen.caches/jetbrains/mps/lang/intentions/behavior/generated
	languages/languageDesign/make/languages/facet/source_gen.caches/jetbrains/mps/make/facet/behavior/generated
	languages/languageDesign/make/languages/facet/source_gen.caches/jetbrains/mps/make/facet/constraints/generated
	languages/languageDesign/make/languages/script/source_gen.caches/jetbrains/mps/make/script/behavior/generated
	languages/languageDesign/make/languages/script/source_gen.caches/jetbrains/mps/make/script/constraints/generated
	languages/languageDesign/pattern/languages/testLang/source_gen.caches/jetbrains/mps/lang/pattern/testLang/constraints/generated
	languages/languageDesign/pattern/source_gen.caches/jetbrains/mps/lang/pattern/behavior/generated
	languages/languageDesign/pattern/source_gen.caches/jetbrains/mps/lang/pattern/constraints/generated
	languages/languageDesign/plugin/source_gen.caches/jetbrains/mps/lang/plugin/behavior/generated
	languages/languageDesign/plugin/source_gen.caches/jetbrains/mps/lang/plugin/constraints/generated
	languages/languageDesign/project/source_gen.caches/jetbrains/mps/lang/project/constraints/generated
	languages/languageDesign/quotation/source_gen.caches/jetbrains/mps/lang/quotation/behavior/generated
	languages/languageDesign/refactoring/source_gen.caches/jetbrains/mps/lang/refactoring/behavior/generated
	languages/languageDesign/script/source_gen.caches/jetbrains/mps/lang/script/behavior/generated
	languages/languageDesign/sharedConcepts/source_gen.caches/jetbrains/mps/lang/sharedConcepts/behavior/generated
	languages/languageDesign/smodel/languages/smodelTests/source_gen.caches/jetbrains/mps/lang/smodelTests/constraints/generated
	languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/behavior/generated
	languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/constraints/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/behavior/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/constraints/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/editor/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generator_new/baseLanguage/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/refactorings/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/scripts/generated
	languages/languageDesign/stubs/source_gen.caches/jetbrains/mps/lang/stubs/behavior/generated
	languages/languageDesign/stubs/source_gen.caches/jetbrains/mps/lang/stubs/constraints/generated
	languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/behavior/generated
	languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/behavior/generated
	languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/constraints/generated
	languages/languageDesign/typesystem/languages/test/source_gen.caches/jetbrains/mps/bootstrap/helgins/test/behavior/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/behavior/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/constraints/generated
	languages/languageDesign/typesystem/source_gen/jetbrains/mps/lang/typesystem/constraints/trace.info
	languages/util/builders/source_gen.caches/jetbrains/mps/baseLanguage/builders/behavior/generated
	languages/util/builders/source_gen.caches/jetbrains/mps/baseLanguage/builders/constraints/generated
	languages/util/buildlanguage/languages/buildlanguage/source_gen.caches/jetbrains/mps/buildlanguage/constraints/generated
	languages/util/buildlanguage/languages/generictasks/source_gen.caches/jetbrains/mps/build/generictasks/behavior/generated
	languages/util/buildlanguage/languages/generictasks/source_gen.caches/jetbrains/mps/build/generictasks/constraints/generated
	languages/util/buildlanguage/languages/packaging/source_gen.caches/jetbrains/mps/build/packaging/behavior/generated
	languages/util/conf/languages/conf/source_gen.caches/jetbrains/mps/platform/conf/constraints/generated
	languages/util/contracts/languages/contracts/source_gen.caches/jetbrains/mps/baseLanguage/contracts/behavior/generated
	languages/util/dates/internal/source_gen.caches/jetbrains/mps/baseLanguage/datesInternal/behavior/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/behavior/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/constraints/generated
	languages/util/dates/source_gen/jetbrains/mps/baseLanguage/dates/constraints/trace.info
	languages/util/extensionMethod/source_gen.caches/jetbrains/mps/baseLanguage/extensionMethods/behavior/generated
	languages/util/extensionMethod/source_gen.caches/jetbrains/mps/baseLanguage/extensionMethods/constraints/generated
	languages/util/gtext/source_gen.caches/jetbrains/mps/gtext/behavior/generated
	languages/util/gtext/source_gen.caches/jetbrains/mps/gtext/constraints/generated
	languages/util/ideUiLanguage/source_gen.caches/jetbrains/mps/ide/uiLanguage/behavior/generated
	languages/util/math/source_gen.caches/jetbrains/mps/baseLanguage/math/behavior/generated
	languages/util/money/source_gen.caches/jetbrains/mps/baseLanguage/money/behavior/generated
	languages/util/quickQueryLanguage/source_gen.caches/jetbrains/mps/quickQueryLanguage/behavior/generated
	languages/util/regexp/source_gen.caches/jetbrains/mps/baseLanguage/regexp/behavior/generated
	languages/util/regexp/source_gen.caches/jetbrains/mps/baseLanguage/regexp/constraints/generated
	languages/util/runConfigurations/languages/settings/source_gen.caches/jetbrains/mps/execution/settings/behavior/generated
	languages/util/runConfigurations/languages/settings/source_gen.caches/jetbrains/mps/execution/settings/constraints/generated
	languages/util/runConfigurations/languages/util/source_gen.caches/jetbrains/mps/execution/util/behavior/generated
	languages/util/ui/languages/internal/source_gen.caches/jetbrains/mps/ui/internal/behavior/generated
	languages/util/ui/languages/meta/source_gen.caches/jetbrains/mps/ui/modeling/behavior/generated
	languages/util/ui/languages/meta/source_gen.caches/jetbrains/mps/ui/modeling/constraints/generated
	languages/util/ui/languages/ui/source_gen.caches/jetbrains/mps/ui/behavior/generated
	languages/util/ui/languages/ui/source_gen.caches/jetbrains/mps/ui/constraints/generated
	languages/util/uiLanguage/source_gen.caches/jetbrains/mps/uiLanguage/behavior/generated
	languages/util/uiLanguage/source_gen.caches/jetbrains/mps/uiLanguage/constraints/generated
	languages/util/xml/xmlInternal/source_gen.caches/jetbrains/mps/xmlInternal/behavior/generated
	languages/util/xml/xmlInternal/source_gen.caches/jetbrains/mps/xmlInternal/constraints/generated
	languages/util/xml/xmlQuery/source_gen.caches/jetbrains/mps/xmlQuery/behavior/generated
	languages/util/xml/xmlQuery/source_gen.caches/jetbrains/mps/xmlQuery/constraints/generated
	languages/util/xml/xmlQuery/source_gen/jetbrains/mps/xmlQuery/constraints/trace.info
	languages/util/xml/xmlSchema/source_gen.caches/jetbrains/mps/xmlSchema/constraints/generated
	languages/util/xmlUnitTest/languages/xmlUnitTest/source_gen.caches/jetbrains/mps/xmlUnitTest/behavior/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/behavior/generated
	plugins/debugger-api-languages/jetbrains.mps.debugger.api.lang/source_gen.caches/jetbrains/mps/debugger/api/lang/behavior/generated
	plugins/debugger-java/languages/customViewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/behavior/generated
	plugins/debugger-java/languages/customViewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/constraints/generated
	plugins/debugger-java/languages/evaluation/source_gen.caches/jetbrains/mps/debugger/java/evaluation/behavior/generated
	plugins/debugger-java/languages/evaluation/source_gen.caches/jetbrains/mps/debugger/java/evaluation/constraints/generated
	plugins/debugger-java/languages/privateMembers/source_gen.caches/jetbrains/mps/debugger/java/privateMembers/behavior/generated
	plugins/execution-languages/commands/source_gen.caches/jetbrains/mps/execution/commands/behavior/generated
	plugins/execution-languages/commands/source_gen.caches/jetbrains/mps/execution/commands/constraints/generated
	plugins/execution-languages/configurations/source_gen.caches/jetbrains/mps/execution/configurations/behavior/generated
	plugins/execution-languages/configurations/source_gen.caches/jetbrains/mps/execution/configurations/constraints/generated
	plugins/execution-languages/deprecated/source_gen.caches/jetbrains/mps/execution/configurations/deprecated/behavior/generated
	plugins/execution-languages/deprecated/source_gen.caches/jetbrains/mps/execution/configurations/deprecated/constraints/generated
	plugins/vcs/source_gen.caches/jetbrains/mps/vcs/integration/generated
	samples/calculator-tutorial/languages/calculator/source_gen.caches/jetbrains/mps/calculator/behavior/generated
	samples/complexLanguage/languages/complex/source_gen.caches/jetbrains/mps/samples/complex/behavior/generated
	samples/dslbook_example/languages/secretCompartmentLanguage/source_gen.caches/jetbrains/mps/samples/secretCompartmentLanguage/constraints/generated
	samples/nanoc/nanocProject/languages/nanoc/source_gen.caches/jetbrains/mps/nanoc/behavior/generated
	samples/sampleLanguage/source_gen.caches/jetbrains/mps/debug/sampleLanguage/behavior/generated
	samples/xmlLiterals/languages/xmlLiterals/source_gen.caches/jetbrains/mps/samples/xmlLiterals/behavior/generated
	testbench/languages/source_gen.caches/jetbrains/mps/testbench/suite/behavior/generated
	testbench/languages/source_gen.caches/jetbrains/mps/testbench/suite/constraints/generated
	testbench/modules/miscTests/tests_gen.caches/jetbrains/mps/refactoring/tests/generated
Made project MPS
Made project MPS
Rebuild project MPS
Merge branch 'master' into feature/88_make_integration

Conflicts:
	core/ant/source_gen.caches/jetbrains/mps/build/ant/generated
	core/ant/source_gen.caches/jetbrains/mps/build/ant/generation/unittest/generated
	core/ant/source_gen.caches/jetbrains/mps/build/ant/generation/workers/generated
	core/generator/source_gen.caches/jetbrains/mps/generator/impl/generated
	core/kernel/source_gen.caches/jetbrains/mps/checkers/generated
	core/kernel/source_gen.caches/jetbrains/mps/kernel/model/generated
	core/make-runtime/solutions/jetbrains.mps.make.runtime/source_gen.caches/jetbrains/mps/internal/make/runtime/java/generated
	core/make-runtime/solutions/jetbrains.mps.make.runtime/source_gen.caches/jetbrains/mps/internal/make/runtime/util/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/actions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/behavior/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/constraints/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/findUsages/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/closures/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/conceptFunctionDefaults/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/strings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/intentions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/plugin/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/refactorings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/scripts/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/stubs/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/textGen/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/util/plugin/refactorings/generated
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/textGen/trace.info
	languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated
	languages/baseLanguage/tuples/languages/tuples/source_gen.caches/jetbrains/mps/baseLanguage/tuples/generator/template/main/generated
	languages/languageDesign/findUsages/source_gen.caches/jetbrains/mps/lang/findUsages/behavior/generated
	languages/languageDesign/intentions/source_gen.caches/jetbrains/mps/lang/intentions/behavior/generated
	languages/languageDesign/pattern/languages/testLang/source_gen.caches/jetbrains/mps/lang/pattern/testLang/editor/generated
	languages/languageDesign/pattern/languages/testLang/source_gen.caches/jetbrains/mps/lang/pattern/testLang/generated
	languages/languageDesign/pattern/languages/testLang/source_gen.caches/jetbrains/mps/lang/pattern/testLang/generator/template/main/generated
	languages/languageDesign/pattern/languages/testLang/source_gen.caches/jetbrains/mps/lang/pattern/testLang/structure/generated
	languages/languageDesign/plugin/source_gen.caches/jetbrains/mps/lang/plugin/behavior/generated
	languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/behavior/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/editor/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/findUsages/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/refactorings/generated
	languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/scripts/generated
	languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/behavior/generated
	languages/languageDesign/traceable/source_gen.caches/jetbrains/mps/lang/traceable/plugin/generated
	languages/languageDesign/typesystem/source_gen.caches/jetbrains/mps/lang/typesystem/generator/baseLanguage/template/main/generated
	languages/util/bash/languages/bash/source_gen.caches/jetbrains/mps/bash/behavior/generated
	languages/util/buildlanguage/languages/generictasks/source_gen.caches/jetbrains/mps/build/generictasks/generator/template/main/generated
	languages/util/buildlanguage/languages/generictasks/source_gen.caches/jetbrains/mps/build/generictasks/taskfromjar/generated
	languages/util/buildlanguage/languages/packaging/source_gen.caches/jetbrains/mps/build/packaging/behavior/generated
	languages/util/buildlanguage/languages/reduced/source_gen.caches/jetbrains/mps/build/reduced/plugin/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/actions/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/editor/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/generator/baseLanguage/template/main/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/generator/baseLanguage/template/util/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/intentions/generated
	languages/util/dates/source_gen.caches/jetbrains/mps/baseLanguage/dates/typesystem/generated
	languages/util/dates/source_gen/jetbrains/mps/baseLanguage/dates/constraints/trace.info
	languages/util/runConfigurations/languages/settings/source_gen.caches/jetbrains/mps/execution/settings/behavior/generated
	languages/util/runConfigurations/languages/util/source_gen.caches/jetbrains/mps/execution/util/behavior/generated
	languages/util/xml/xmlQuery/source_gen/jetbrains/mps/xmlQuery/constraints/trace.info
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/actions/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/editor/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/generator/baseLanguage/template/generic/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/generator/baseLanguage/template/main/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/intentions/generated
	languages/util/ypath/source_gen.caches/jetbrains/mps/ypath/structure/generated
	plugins/execution-languages/commands/source_gen.caches/jetbrains/mps/execution/commands/behavior/generated
	plugins/execution-languages/configurations/source_gen.caches/jetbrains/mps/execution/configurations/behavior/generated
	plugins/execution-languages/deprecated/source_gen.caches/jetbrains/mps/execution/configurations/deprecated/behavior/generated
	plugins/execution-languages/tests/test_gen.caches/jetbrains/mps/execution/impl/configurations/tests/commands/generated
	testbench/languages/source_gen.caches/jetbrains/mps/testbench/suite/constraints/generated
	testbench/modules/miscTests/tests_gen.caches/jetbrains/mps/refactoring/tests/generated
	testbench/tests_gen.caches/jetbrains/mps/tests/generated
	testbench/tests_gen/jetbrains/mps/tests/trace.info
- moving jetbrains.mps.baseLanguage.util.plugin.refactorings model into jetbrains.mps.baseLanguage.util solution
- moving some refactoring-specific classes into jetbrains.mps.baseLanguage.util.plugin.refactorings
- adjusting generator priorities for smodel language
- replacing RenameRefactoringDialog with RenameDialog
Merge remote-tracking branch 'origin/master' into scrum/editorActions

Conflicts:
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/util/plugin/refactorings/trace.info
	languages/baseLanguage/collections/source_gen/jetbrains/mps/baseLanguage/collections/generator/baseLanguage/template/main/QueriesGenerated.java
rebuilding models after merge
Merge remote branch 'origin/master' into feature/88_make_integration

Conflicts:
	core/generator/source_gen.caches/jetbrains/mps/generator/impl/generated
	core/kernel/source_gen/jetbrains/mps/kernel/model/trace.info
	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/actions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/behavior/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/findUsages/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/closures/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/conceptFunctionDefaults/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/strings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/intentions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/plugin/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/refactorings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/scripts/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/stubs/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/textGen/generated
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/behavior/trace.info
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/textGen/trace.info
	languages/util/buildlanguage/languages/generictasks/source_gen.caches/jetbrains/mps/build/generictasks/taskfromjar/generated
	testbench/modules/miscTests/tests_gen.caches/jetbrains/mps/refactoring/tests/generated
Made project MPS