cleanup, display current playing file, remove / entry
update
I wish I new why I need to merge.

Merge branch 'master' of https://github.com/michkrom/android