überarbeitet und so
Merge branch 'master' of https://github.com/Nepetalactone/Konzepte

Conflicts:
	just/bin/javacc/JUST$JJCalls.class
	just/bin/javacc/JUST$LookaheadSuccess.class
	just/bin/javacc/JUST.class
	just/bin/javacc/JUSTConstants.class
	just/bin/javacc/JUSTGrammar.jj
	just/bin/javacc/JUSTTokenManager.class
	just/src/javacc/JUST.java
	just/src/javacc/JUSTConstants.java
	just/src/javacc/JUSTGrammar.jj
	just/src/javacc/JUSTTokenManager.java