Liveticker GET korrigiert, erweitert, 2te XML_TestDatei eingefuegt
Merge remote-tracking branch 'origin/master'

Conflicts:
	WBA2_Phase2/WBA2_Phase2.iml
reset
Merge remote-tracking branch 'origin/master'

Conflicts:
	WBA2_Phase2/src/main/java/RestService/RestServer.java
reset