wip.
Merge branch 'master' of https://github.com/Hotware/HotSound.git

Conflicts:
	src/de/hotware/hotsound/audio/player/StreamMusicPlayer.java