Fi mismerge
Collapsed Albums: add setting
Collapsed Albums: add strings
Collapsed Albums: add PlaylistAlbum
Collapsed Albums: add size() and hasText() to AbstractPlaylistMusic
Collapsed Albums: PlaylistFragment: import
Collapsed Albums: PlaylistFragment: add vars

Conflicts:
	MPDroid/src/com/namelessdev/mpdroid/fragments/PlaylistFragment.java
Collapsed Albums: PlaylistFragment: playlistAlbumWithSongId
Collapsed Albums: PlaylistFragment: onActionItemClicked

Conflicts:
	MPDroid/src/com/namelessdev/mpdroid/fragments/PlaylistFragment.java
Collapsed Albums: PlaylistFragment: update
Collapsed Albums: PlaylistFragment: scrollToNowPlaying
Collapsed Albums: PlaylistFragment: trackChanged
Collapsed Albums: PlaylistFragment: onDrop
Collapsed Albums: PlaylistFragment: itemMenuButtonListener

Conflicts:
	MPDroid/src/com/namelessdev/mpdroid/fragments/PlaylistFragment.java
Collapsed Albums: PlaylistFragment: R.id.PLCX_playNext
Collapsed Albums: PlaylistFragment: PLCX_moveFirst
Collapsed Albums: PlaylistFragment: PLCX_moveLast
Collapsed Albums: PlaylistFragment: PLCX_removeFromPlaylist
Collapsed Albums: PlaylistFragment: PLCX_goToArtist
Collapsed Albums: PlaylistFragment: getView setSelected()