dvdplayer: get number of channels for active audio stream from audio player, ffmpeg demuxer does not update this info for codecs like AAC
FIX: [droid] fixup preventing closing when removing keyboard with touchpad
FFmpeg: Bump to version 2.3.2
fixed: built-in function SetStereoMode not work
[python] fix ListItem.setPath docs
[python] add setSubtitles method for ListItem
[pvr] properly update the view mode when switching channels
[addons] Add and refresh icons.

Any more please let me know, especially for main addons repo or kodi/ex-xbmc lots.
Merge pull request #5165 from uNiversaI/icons

[addons] add and refresh icons.
Merge pull request #5203 from taxigps/setstereomode

fixed: built-in function SetStereoMode not work
Merge pull request #5192 from tamland/setsubtitles

[python] add setSubtitles method for ListItem
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
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