Merge pull request #4456 from koying/showdroidprops

CHG: [droid] show build properties at startup for easier debug
Merge pull request #4454 from ronie/mvid-track

make musicvideo tracknumber available to skins
Merge pull request #4441 from Memphiz/osxdevicereset

[osx] - fix issues with turning off/on tv when playback is paused
Merge pull request #4448 from Karlson2k/xml_warn_charset

XBMCTinyXML: put warnings to log if suspicious charset is used for XML processing
Merge pull request #4461 from fritsch/activeae-coverity

AE: coverity changes
Merge pull request #4455 from wsnipex/online-check

get rid of non DNS online check
Merge pull request #4442 from FernetMenta/channels

AE: fix CAEChannelInfo::ResolveChannels, it returned duplicate channels ...
Merge pull request #4452 from NedScott/settings-description

correct ID for PVR settings description
Merge pull request #4462 from cg110/CoverityFixes2

A couple more bugs fixes from Coverity
Merge pull request #4088 from xhaggi/fix-schedule-recording

[pvr] fix: schedule recording with ending after midnight (Ticket #14165)
Merge pull request #4465 from arnova/subtitle_path_setting

changed: Always show subtitle custom path option
Merge pull request #4464 from Jojjec1/master

Fixed import of fanart for tvshow/mvideo