FUKINGIGWER
Merge branch 'master' of https://github.com/kainkordian/Alp5

Conflicts:
	bin/alpv_ws1415/ub1/webradio/communication/U1_akClient.class
	bin/alpv_ws1415/ub1/webradio/communication/U1_akServer.class
	src/alpv_ws1415/ub1/webradio/communication/StreamingThread.java
	src/alpv_ws1415/ub1/webradio/communication/U1_akServer.java