Merge branch 'Gotham' of https://github.com/xbmc/xbmc into gotham

Conflicts:
	xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
	xbmc/settings/Settings.cpp