Merge remote-tracking branch 'origin/master' into eden-master
Merge branch 'eden-master' of github.com:Synopsi/XBMC into eden-master
* fix: 'watched' from context menu didn't work, var init