Merge branch 'master' of git@github.com:PeteManchester/MediaPlayer.git

Conflicts:
	com.upnp.mediaplayer/plugins/LastFM/LastFM.xml
Merge branch 'master' of https://github.com/PeteManchester/MediaPlayer