3.0.3 -> 3.0.4
Merge remote-tracking branch 'origin/MPS3.0'

Conflicts:
	IdeaPlugin/mps-core/META-INF/plugin.xml
	IdeaPlugin/mps-java/META-INF/plugin.xml
	IdeaPlugin/mps-vcs/META-INF/plugin.xml
	MPSPlugin/META-INF/plugin.xml
	build/mpsBootstrapCore.xml
	languages/util/uiLanguage/source_gen.caches/jetbrains/mps/uiLanguage/behavior/generated
	plugins/console/META-INF/plugin.xml
	plugins/debugger-api/META-INF/plugin.xml
	plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps
	plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml
	plugins/debugger-java-customViewers/META-INF/plugin.xml
	plugins/debugger-java/META-INF/plugin.xml
	plugins/debugger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps
	plugins/debugger-java/customViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml
	plugins/execution-api/META-INF/plugin.xml
	plugins/execution-configurations/META-INF/plugin.xml
	plugins/execution-configurations/languages/plugin/jetbrains/mps/execution/configurations/implementation/plugin/plugin.mps
	plugins/execution-configurations/languages/plugin/source_gen/jetbrains/mps/execution/configurations/implementation/plugin/plugin/plugin.xml
	plugins/execution-languages/META-INF/plugin.xml
	plugins/execution-languages/languages/plugin/models/jetbrains/mps/execution/languages/plugin.mps
	plugins/execution-languages/languages/plugin/source_gen/jetbrains/mps/execution/languages/plugin/plugin.xml
	plugins/ideaIntegration/META-INF/plugin.xml
	plugins/migrationAssistant/META-INF/plugin.xml
	plugins/modelchecker/META-INF/plugin.xml
	plugins/modelchecker/solution/modelchecker/actions.mps
	plugins/modelchecker/source_gen/jetbrains/mps/ide/modelchecker/actions/plugin.xml
	plugins/mps-build/META-INF/plugin.xml
	plugins/mps-build/solutions/mpsBuild/models/build.mps
	plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
	plugins/mps-core/META-INF/plugin.xml
	plugins/mps-testing/META-INF/plugin.xml
	plugins/mpsdevkit/META-INF/plugin.xml
	plugins/mpsdevkit/solution/devkit/actions.mps
	plugins/mpsdevkit/source_gen/jetbrains/mps/ide/devkit/actions/plugin.xml
	plugins/mpsjava/META-INF/plugin.xml
	plugins/mpsmake/META-INF/plugin.xml
	plugins/mpsmake/make/actions.mps
	plugins/mpsmake/source_gen/jetbrains/mps/ide/make/actions/plugin.xml
	plugins/mpsmigration/META-INF/plugin.xml
	plugins/samples/META-INF/plugin.xml
	plugins/vcs/META-INF/plugin.xml
	plugins/vcs/models/jetbrains/mps/vcs/plugin.mps
	plugins/vcs/source_gen/jetbrains/mps/vcs/plugin/plugin.xml
	workbench/mps-workbench/models/actions.mps
	workbench/mps-workbench/source_gen/jetbrains/mps/ide/actions/plugin.xml