Merge remote-tracking branch 'origin/master' into unified-builtins2
Merge branch 'master' into unified-builtins2
Towards fixing blocking input.
Hack to make it work (for now).
Merge remote-tracking branch 'origin/master' into unified-builtins2

Conflicts:
	include/builtins/list.k
	include/builtins/map.k
	include/builtins/set.k
included imp & imp++ into configjavarw.xml; fixed imp++
Merge remote-tracking branch 'origin/master' into unified-builtins2
Added DependsOn and Provides annotations
Added Javadoc for ResolveBlockingINput.
Merge pull request #253 from kframework/traiansf-review2

Traiansf review2
Merge remote-tracking branch 'origin/master' into unified-builtins2

Conflicts:
	tests/regression/java-rewrite-engine/smt_model/program.test.out
Fixed @KilProperty annotations and isPredicateLabel
Merge remote-tracking branch 'origin/master' into unified-builtins2
Merge remote-tracking branch 'upstream/master' into unified-builtins2

Conflicts:
	samples/java_rewrite_engine/tutorial/1_k/2_imp/tests/config.xml
	samples/java_rewrite_engine/tutorial/2_languages/2_kool/1_untyped/kool-untyped.k
	samples/java_rewrite_engine/tutorial/2_languages/2_kool/2_typed/1_dynamic/kool-typed-dynamic.k
	samples/java_rewrite_engine/tutorial/2_languages/2_kool/2_typed/2_static/kool-typed-static.k
	src/javasources/KTool/src/org/kframework/compile/transformers/FlattenSyntax.java
updated imp, lesson 1
Updated IMP with unified builtins in the tutorial
Updated README.md
Merge pull request #353 from grosu/unified-builtins2

updated imp, lesson 1
Eliminated the inferrable sorts
added copyright notes