Merge pull request #3093 from ronie/confluence-scanning

[Confluence] fix 'Update library' button
[osx/atv2/ios] - sync xcode project after json-rpc profile pr
smartplaylists: "Date added" rule is not supported for songs (fixes #14539)
[osx/ios/atv2] restore missing -DSILENT compiler flag for UnrarXLib
Merge pull request #3083 from fritsch/active-ae-compile-fixes

ActiveAE: Remove compile warnings
update skin Touched
Merge pull request #3065 from elupus/apk

Apk path fixes
Revert "[jenkins] - use a new method to determine the branch name by ignoring the pr ref_spec - thx to theuni for figuring that out"

This reverts commit afb5a6998c0c0a191e88ae53671df79fc00d55b2.

It resulted in "undefined" branch name. Stick with the old method until someone decides its not working for all cases. Sry TheUni - but theory proved wrong ... ;)
[musicdb] fix for duplicates when mixing musicbrainz & non-musicbrainz artists
[musicdb] don't clean music library on scan (fix for deleting music when source is offline)
Merge pull request #3090 from night199uk/musicfixes

[musicdb] Music DB fixes for a few of the recently reported issues
[depends] - fix compilation of python26 when compiling for android on osx host
Fix load of PIL egg by include its source files.
[ffmpeg] - backport "Fix compilation on ARM with android gcc 4.7" from ffmpeg - fixes compilation on gcc 4.8 with ndk r9
[Fix] Read proxy port setting using GetInt().
Don't display blank SMB workgroups.
Small CGUIControl optimization
[OSX] Kickout screensaver if it's running
Fix http directory item detection for items with querystring
Merge pull request #3105 from ulion/osx_kick_screensaver_fix

[OSX] Kickout screensaver if it's running. Fix #14271