Merge pull request #1818 from alcoheca/fix-updates

Fix upnp season updates
Merge pull request #1548 from DDDamian/SoftSuspendSink

[AE] Allow sink to decide how or if it can be suspended
Merge pull request #1847 from mikrohard/pvr-wakeup

Only use valid CDateTime objects for pvr wakeup command
[bitstreamconverter] fixed return correct extradata/size and allow 3byte NAL sizes
boolean argument add support in dbus message
systemd/logind power management support
epg: new advanced setting that overrides the user defined EPG update interval for TV channels that have no EPG data (defaults to 1 minute)
fixed GetArtistDetails to return artist
Merge pull request #1865 from tthomas48/master

jsonrpc: fix GetArtistDetails to return required "artist" field
jsonrpc: change versioning to <major>.<minor>.<patch> and change JSONRPC.Version to return an object with "major", "minor" and "patch" properties

This versioning follows the Semantic Versioning Specification available at
http://semver.org/. <major> will be bumped on any backwards incompatible
change. <minor> will be bumped on the introduction of any backwards compatible
functionality. <patch> will be bumped on any change to the internal code (i.e.
fixing a bug in the code) which does not affect the API definition.
jsonrpc: bump version to 6.0.0
jsonrpc: log the current version of the JSON-RPC API
[droid] add missing android platform for filtering
Merge pull request #1862 from da-anda/keymap-xbox360w

Improved keymap for XBOX 360 Wireless controllers
fixed: don't announce screensaver deactivation on DPMS activation

CEC client take screensaver deactivation as a indication of waking
TV from standby (and happily switching input if you happen to be
watching some nice TV show on another input)
bump libpng to 1.5.13
[fix] build screensavers on osx
[lang] update of core language files for beta2
[lang] update of internal addon language files for beta2
bump SDL_image to 1.2.12