Feedback Integration
Merge branch 'master' of https://github.com/ein-langer-weg/startup

Conflicts:
	src/main/java/de/mft/interpretation/Interpretation.java