dvdplayer: get number of channels for active audio stream from audio player, ffmpeg demuxer does not update this info for codecs like AAC
rename SetPartOfSet and Get/SetTrackAndDiskNumber
CHG: [droid] Do not pause music when going to background
FIX: [droid] fixup preventing closing when removing keyboard with touchpad
[win32] upgrade xbmc-test to VS2013 and remove unused projects
[addons] respect type information for addons with no extension

fixme was fixed in 8d99ec72b6a
[python] only add modules listed as dependecy to path
CHG: Refactor ffmpeg MT support
FFmpeg: Bump to version 2.3.2
[pvr] properly update the view mode when switching channels
Fixed default sorting for tv show years
LINUX: Fix compile error.

Removal of utils/StdString.h in 6c3a7b62 lost an indirect include of
stdio.h which defined FILE for this header.
Merge pull request #5226 from t-nelson/compile_fix

LINUX: Fix compile error.
Merge pull request #5206 from fritsch/ffmpeg-2.3.2

FFmpeg: Bump to version 2.3.2
ALSA: remove log spam by adding not ELD listed passthrough formats after the pcm formats
Rename isDVDImage() to isDiscImage().

Conflicts:
	xbmc/video/windows/GUIWindowVideoBase.cpp
[win32] rename and generalise packaging folders. also simplify NSIS installer to match package folders
Merge pull request #5067 from Jalle19/fix-channel-view-mode

[pvr] properly update the view mode when switching channels
smartplaylists: fix generated SQL query for multi-value rules with a negated parameter (fixes #15313)
add linebreak after cpu info - fixes #15389