Merge remote-tracking branch 'remotes/origin/master' into defaultEditor

Conflicts:
	languages/languageDesign/generator/languages/templateLanguage/languageModels/editor.mps
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/editor/dependencies
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/editor/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen/jetbrains/mps/lang/generator/editor/trace.info
	plugins/vcs/common/models/diff/ui/common.mps
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/changesmanager/editor/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/changesmanager/generated
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/diff/ui/common/dependencies
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/diff/ui/common/generated
	plugins/vcs/common/source_gen/jetbrains/mps/vcs/diff/ui/common/trace.info
	workbench/mps-workbench/models/actions.mps
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/actions/dependencies
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/actions/generated
	workbench/mps-workbench/source_gen/jetbrains/mps/ide/actions/trace.info
generate
create default editor
checkers
add reference presentation to defaultEditor
add includeBaseConceptFlag to getAllSuperConcepts() method
add "children:", "references: " and "properties:" labels
don't check for properties in descriptor
default editor looks like statement-like default editor generated by intention in mps
add cell Id's where needed
create testLanguage for defaultEditor testing
add test language and tests for defaultEditor
Merge remote-tracking branch 'remotes/origin/master' into testEditor

    Conflicts:
    	core/kernel/source_gen/jetbrains/mps/checkers/ConstraintsChecker.java
    	editor/editor-runtime/source_gen/jetbrains/mps/editor/runtime/impl/EditorsFinderManager.java
    	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.refactoringTest/source_gen.caches/jetbrains/mps/editorTest/generated
    	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/editor/generated
    	plugins/vcs/common/models/diff/ui/common.mps
    	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/changesmanager/editor/generated
    	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/changesmanager/generated
    	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/diff/ui/common/dependencies
    	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/diff/ui/common/generated
    	plugins/vcs/common/source_gen/jetbrains/mps/vcs/diff/ui/common/trace.info
    	workbench/mps-workbench/models/actions.mps
    	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/actions/dependencies
    	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/actions/generated
    	workbench/mps-workbench/source_gen/jetbrains/mps/ide/actions/trace.info
make
add aditor annotations to defaultEditorTest
fix substitute tests
fix constraints
rebuild
Merge remote-tracking branch 'remotes/origin/master' into testEditor

Conflicts:
	MPS.mpr
run GeneratorsRunner