Merge branch 'master' of http://github.com/MediaPortal/MediaPortal-1 into FEAT_Last.fm_API_2.0
Small cleanup and extra debug code added to last.fm radio
Merge remote-tracking branch 'remotes/upstream/FEAT_Last.fm_API_2.0' into 1.4.0Fork_SEB_New_Master