Merge branch 'master' into unified-builtins2

Conflicts:
	samples/java_rewrite_engine/tutorial/1_k/2_imp/tests/config.xml
	src/javasources/KTool/src/org/kframework/parser/generator/BasicParser.java
fix mistaken merge conflict
Merge branch 'master' into unified-builtins2
README.md files: Added copyright notes and removed the redundant media information
copyright added to all imp.k files
tutorial/4_imp++ revised to use the unified builtins
removed the env(...) wrapper for the environment recovery items
removed a forgotten K::= env(Map)
Merge branch 'imppp' of https://github.com/grosu/k into imppp

Conflicts:
	tutorial/1_k/4_imp++/lesson_7/imp.k
Merge branch 'master' into unified-builtins2
Merge pull request #371 from grosu/imppp

Imppp
Update the quine examples for the  Unified-builtins branch.
Added the copyright at the beginning of the file.
Updating the output of the tests too.
Merge pull request #422 from kframework/quine-update

Quine update
unified-builtins checks only the tests that work
fix copyright on files modified on unified-builtins2 branch
fix xml declarations
removed redundant config_java.xml
Merge branch 'unified-builtins-test' of https://github.com/kframework/k into unified-builtins-test