Merge branch 'dev' into 41-cleanup-parser

# Conflicts:
#	eraser-base/src/main/jastadd/Item.jrag
#	eraser-base/src/main/jastadd/LastChanged.jrag
#	eraser-base/src/main/jastadd/Navigation.jrag
#	eraser-base/src/main/jastadd/Resolving.jrag
#	eraser-base/src/main/jastadd/Rules.relast
#	eraser-base/src/main/jastadd/eraser.flex
#	eraser-base/src/main/jastadd/eraser.parser
#	eraser-base/src/main/jastadd/main.relast
#	eraser-base/src/main/jastadd/shem.relast
#	eraser-base/src/main/java/de/tudresden/inf/st/eraser/parser/EraserParserHelper.java
#	eraser-base/src/test/java/de/tudresden/inf/st/eraser/RulesTest.java