Merge branch 'master' of https://github.com/Nepetalactone/Konzepte

Conflicts:
	just/bin/javacc/JUSTGrammar.jj
	just/src/javacc/JUSTGrammar.jj (reverted from commit 69b281d8650fec7629c97e4ff995152f12a5a929)