Merge remote-tracking branch 'upstream/master'

Conflicts:
	xbmc/pictures/GUIWindowSlideShow.cpp
Merge branch 'master' of github.com:Rawk/xbmc

Conflicts:
	xbmc/pictures/GUIWindowSlideShow.cpp