websocket connection
Merge branch 'master' of https://github.com/swi88/YourClubMusic

Conflicts:
	src/de/uniol/yourclubmusic/MainActivity.java
Merge branch 'master' of https://github.com/swi88/YourClubMusic