Robot Kaja sample - packaged images into a jar file, since non-packaged images are not supported by the build language
Set the robot Kaja generator to compile templates, so the language could be used for testing implementation stripping
Implementation stripping tests - added a test solution with a simple test, updated the testbench, created a build script that builds tests against the robot Kaja language and updated test.xml to include the tests
Implementation stripping tests - added a few more tests
Ran GeneratorsRunner
Rebuilt testbench
Rebuilt the imple stripping test build script
Cleared the mps_home macro value in the impl stripping build script
Fixed a failing impl stripping test
Rebuilt the robot Kaja sample
Ran GeneratorsRunner
Merge branch '3.2/vaclavStripTests' into 3.2/vaclavStripMerged

Conflicts:
	plugins/mps-build/solutions/mpsBuild/models/jetbrains/mps/ide/build/tests.mps
	testbench/solutions/jetbrains/mps/tests.mps
Merge branch '3.2/vaclavStripTests' into 3.2/vaclavStripMerged

Conflicts:
	plugins/mps-build/solutions/mpsBuild/models/jetbrains/mps/ide/build/tests.mps
	testbench/solutions/jetbrains/mps/tests.mps
Merge branch '3.2/vaclavStripMerged' into 3.2/vaclavStrimMerged2

Conflicts:
	samples/robot_Kaja/languages/KajaAndOr/generator/source_gen/jetbrains/mps/samples/KajaAndOr/generator/template/main/QueriesGenerated.java
	samples/robot_Kaja/languages/KajaAndOr/generator/source_gen/jetbrains/mps/samples/KajaAndOr/generator/template/main/trace.info
	samples/robot_Kaja/languages/KajaSceneConstruction/generator/source_gen/jetbrains/mps/samples/KajaSceneConstruction/generator/template/main/QueriesGenerated.java
	samples/robot_Kaja/languages/KajaSceneConstruction/generator/source_gen/jetbrains/mps/samples/KajaSceneConstruction/generator/template/main/trace.info
	samples/robot_Kaja/languages/Kajak/generator/source_gen/jetbrains/mps/samples/Kaja/generator/template/main/trace.info
	testbench/solutions/jetbrains/mps/tests.mps
	testbench/tests_gen/jetbrains/mps/tests/trace.info
Merge branch '3.2/vaclavStripMerged' into 3.2/vaclavStrimMerged2

Conflicts:
	samples/robot_Kaja/languages/KajaAndOr/generator/source_gen/jetbrains/mps/samples/KajaAndOr/generator/template/main/QueriesGenerated.java
	samples/robot_Kaja/languages/KajaAndOr/generator/source_gen/jetbrains/mps/samples/KajaAndOr/generator/template/main/trace.info
	samples/robot_Kaja/languages/KajaSceneConstruction/generator/source_gen/jetbrains/mps/samples/KajaSceneConstruction/generator/template/main/QueriesGenerated.java
	samples/robot_Kaja/languages/KajaSceneConstruction/generator/source_gen/jetbrains/mps/samples/KajaSceneConstruction/generator/template/main/trace.info
	samples/robot_Kaja/languages/Kajak/generator/source_gen/jetbrains/mps/samples/Kaja/generator/template/main/trace.info
	testbench/solutions/jetbrains/mps/tests.mps
	testbench/tests_gen/jetbrains/mps/tests/trace.info
Implementation stripping tests - Included the robot_Kaja images in the test build
Implementation stripping tests - added a routine uniqueness test
Implementation stripping tests - fixed the routine uniqueness test
Ran GeneratorsRunner
Ran GeneratorsRunner