Merge branch 'master' of git://github.com/VAlux/YAMP

Conflicts:
	YAMPProject/YAMP/src/main/res/layout/audio_library_albumartist_entry.xml