Merge branch 'master' of http://github.com/MediaPortal/MediaPortal-1 into BUG_4240_Use_existing_skin_choice
Merge branch 'BUG_4240_Use_existing_skin_choice'
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV_Music