merge
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE

Conflicts:
	app/what/sp_parser/SplittingTool.java
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE

Conflicts:
	app/what/sp_parser/ParsingTask.java
	app/what/sp_parser/SplittingTool.java