Merge branch 'master' into unified-builtins2

Conflicts:
	samples/java_rewrite_engine/tests/config.xml
	samples/java_rewrite_engine/tutorial/2_languages/tests/config.xml
	samples/java_rewrite_engine/tutorial/tests/config.xml
	samples/quine/explicit/quine-explicit.k
	samples/quine/short/quine-short.k
	samples/tests/config.xml
	src/javasources/KTool/src/org/kframework/backend/maude/MaudeFilter.java
	src/javasources/KTool/src/org/kframework/compile/checks/CheckRewrite.java
	src/javasources/KTool/src/org/kframework/compile/sharing/DataStructureSortCollector.java
	src/javasources/KTool/src/org/kframework/compile/transformers/AddInjections.java
	src/javasources/KTool/src/org/kframework/compile/transformers/ResolveBlockingInput.java
	tests/config.xml
	tests/regression/java-rewrite-engine/pattern_matching/test.k
	tutorial/1_k/2_imp/lesson_1/imp.k
	tutorial/1_k/2_imp/lesson_1/tests/config.xml
	tutorial/1_k/2_imp/lesson_2/imp.k
	tutorial/1_k/2_imp/lesson_3/imp.k
	tutorial/1_k/2_imp/lesson_4/imp.k
	tutorial/1_k/2_imp/lesson_5/imp.k
	tutorial/1_k/2_imp/tests/config.xml
	tutorial/1_k/4_imp++/lesson_1/imp.k
	tutorial/1_k/4_imp++/lesson_2/imp.k
	tutorial/1_k/4_imp++/lesson_3/imp.k
	tutorial/1_k/4_imp++/lesson_4/imp.k
	tutorial/1_k/4_imp++/lesson_5/imp.k
	tutorial/1_k/4_imp++/lesson_6/imp.k
	tutorial/1_k/4_imp++/lesson_7/imp.k
	tutorial/1_k/4_imp++/lesson_8/imp.k
	tutorial/1_k/4_imp++/tests/config.xml
	tutorial/1_k/tests/config.xml
	tutorial/2_languages/1_simple/2_typed/1_static/tests/config.xml
	tutorial/tests/config.xml