don't show album artist if it is contained in artist tag
Merge branch 'newup2' of https://github.com/hurzl/dmix into hurzl-newup2

Conflicts:
	MPDroid/src/com/namelessdev/mpdroid/fragments/NowPlayingSmallFragment.java