Merge music_player from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	music_player/application.fam