[addonversion] drop unneeded m_originalVersion member
Merge pull request #4731 from jmarshallnz/check_controls

[settings] check control types - the id's have changed so old skins crash
[osx] fix make build/build of tests
[upnp] properly hide the addons node
[cosmetic] drop unused include
[fonts] drop reading of unicode='true' attribute as we assumed it was true anyway
ActiveAE: allow sinks to return planar formats
Merge pull request #4612 from jmarshallnz/addon_version_cleanup

Addon version cleanup
Merge pull request #4699 from FernetMenta/adpcm

dvdplayer: demuxFFmpeg - use bits_per_coded_sample if bits_per_raw_sampl...
check mime type of internet streams. allows hls playlists without m3u8 extension to be played
Fix webserver memory leak

If the webserver is passed an If-Modified-Since value, which indicates
the
client has the current file, there is nothing to send, the code leaked a
context object.

To fix this I've converted a couple of items to smart ptrs.

The context is now an auto_ptr, and if it's used with the mhd callback
we can pass ownership by using release, otherwise it'll get destroyed on
exit of the function.

Also in the context, the CFile object is now a shared_ptr<CFile>, note
that the Close call is carried out in the CFile destructor.

This should make sure that appropriate cleanup occurs as things go out
of scope, without needing to have all the right deletes in the right
places.

In the free callback move the delete before the trace line, so that we
can be sure everything has been closed and freed when that trace line
occurs.
[pydocs] remove httpapi not implemented message. python module dependency bump makes sure these scripts cannot be installed anymore
libcec: Make verbose logging optional
Merge pull request #4630 from Red-F/gotham-resume-pvr-lastplayedposition

FIX resume playing PVR recordings from the exact lastplayed position
[darwin] fix building from user set prefix path. move XBMC_DEPENDS_ROOT to xconfig and set it during configure
[addons] extend repo check to 24 hours
GUIInfoManager: add SYSTEM_BUILD_VERSION_SHORT info type and function. Note: GUIInfoManager::GetVersion() was broken according to comment before function definition.
SysInfo::GetUserAgent: correct UserAgent for all platforms
SysInfo::GetUserAgent: add full version info
SystemInfo: Correct win32 useragent identification