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
error fixed, so it will compile
this and that
nothing.. git problems...
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE

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