for nfc
Merge branch 'master' of https://github.com/swi88/YourClubMusic

Conflicts:
	src/de/uniol/yourclubmusic/MainActivity.java
	src/de/uniol/yourclubmusic/Websocket.java