structure still extends jdk7
proper name for an ant task (mps.generate.chunks -> generate)
Merge remote-tracking branch 'origin/MPS2.5' into julia/3.0

Conflicts:
	build/buildBuildUI.xml
	build/buildCoreEx.xml
	build/buildDebuggerPlugin.xml
	build/buildDeprecatedBuildlanguage.xml
	build/buildDevKit.xml
	build/buildExecutionPlugin.xml
	build/buildObsolete.xml
	build/buildPlugins.xml
	build/buildTroveCollections.xml
	build/mpsBootstrapCore.xml
	build/mpsBuild.xml
	build/mpsDates.xml
	build/mpsExperimental.xml
	build/mpsWorkbench.xml
	build/solution/models/build.mps
	build/solution/source_gen/jetbrains/mps/ide/build/buildBuildUI.xml
	build/solution/source_gen/jetbrains/mps/ide/build/buildCoreEx.xml
	build/solution/source_gen/jetbrains/mps/ide/build/buildDebuggerPlugin.xml
	build/solution/source_gen/jetbrains/mps/ide/build/buildDeprecatedBuildlanguage.xml
	build/solution/source_gen/jetbrains/mps/ide/build/buildDevKit.xml
	build/solution/source_gen/jetbrains/mps/ide/build/buildExecutionPlugin.xml
	build/solution/source_gen/jetbrains/mps/ide/build/buildObsolete.xml
	build/solution/source_gen/jetbrains/mps/ide/build/buildPlugins.xml
	build/solution/source_gen/jetbrains/mps/ide/build/buildTroveCollections.xml
	build/solution/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
	build/solution/source_gen/jetbrains/mps/ide/build/mpsBuild.xml
	build/solution/source_gen/jetbrains/mps/ide/build/mpsDates.xml
	build/solution/source_gen/jetbrains/mps/ide/build/mpsExperimental.xml
	build/solution/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml
	plugins/mps-build/languages/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml
	plugins/mps-build/languages/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml
	plugins/mps-build/languages/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml
	plugins/mps-build/languages/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml
Merge branch 'julia/3.0'

Conflicts:
	build/solution/models/build.mps