Better tests and minor improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	mjcompiler-lexer/src/main/java/edu/kit/pp/mjcompiler/lexer/Token.java