show "Unknown Genre" instead of nothing in title bar of ArtistsFragment
correct argument sequence when calling Item.merged
remove the "Unkown AlbumArtist" when returning merged artist list

fixes #639
Jump to beginning of current song instead of previous if more than 5 sec have been played
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

Conflicts:
	MPDroid/src/main/java/com/namelessdev/mpdroid/views/AlbumDataBinder.java
show disc and track number in NowPlaying