Fix null pointer on NowPlaying Popup
Fix null pointer on NowPlaying Popup
Merge branch 'develop' of https://github.com/abarisain/dmix into develop
Collapsed Albums: add setting
Collapsed Albums: add strings

Conflicts:
	MPDroid/src/main/res/values-de/strings.xml
Collapsed Albums: add PlaylistAlbum
Collapsed Albums: add size() and hasText() to AbstractPlaylistMusic
Collapsed Albums: add CollapsedPlaylistFragment
Collapsed Albums: use CollapsedPlaylistFragment
make playlist text autoscroll
make header in SongsFragment autoscroll
make Songs in SongsFragment autoscroll
autoscroll in albumfragment -- partially
show disc and track number in NowPlaying