Make \r in topics optional
Merge branch 'refactoring' of github.com:TU-Berlin/mathosphere2 into refactoring

Conflicts:
	src/main/java/de/tuberlin/dima/schubotz/fse/mappers/QueryCleaner.java