player
Merge branch 'master' of https://github.com/zian92/Glurak

Conflicts:
	SProject/src/de/glurak/data/Playlist.java