settings: also hide "debug.setextraloglevel" when logging is set in advancedsettings.xml
settings: "masterlock.lockcode" is an action setting and not a string setting
settings: fix ISettingsHandler::OnSettingsSaved() definition

This fixes profile settings not being saved when when normal settings are saved
and prevents the Master lockcode from being saved to profiles.xml after it has
been changed in Settings -> System -> Master lock.
Merge pull request #4099 from vkosh/configure-git

[configure] get git revision from xbmc git root
Merge pull request #4049 from elupus/srtfix

dvdplayer: make sure we restore output timestamps for text based subs
Merge pull request #4132 from wsnipex/pulse

[configure] use pkg-config for pulse audio detection
Merge pull request #4102 from Montellese/platinum_patches_only

platinum: add all currently applied patches
videolibrary: fix crash when entering an empty tvshow
Merge pull request #4177 from FernetMenta/aeformat

AE: let sink decide what passthrough formats it wants to support
AE - ALSA - enable AC3 and DTS for spdif, fix after 3cd8aad53ce8b355e910254e891ca17134a61fae
[keymaps] change keymaps for FullscreenLiveTV section

* left/right for timeshift StepBack/StepForward
Revert "[ios7/ios/atv2] - link statically against libmpeg2 - since ios7 we crash and burn when we load libmpeg2 as dylib - closes #14813"

This reverts commit 0e53fea3bbf092cccad9f5ade492754ee2a22ead.

Conflicts:
	XBMC.xcodeproj/project.pbxproj
Merge pull request #4186 from FernetMenta/aeformat

AE - ALSA - enable AC3 and DTS for spdif, fix after 3cd8aad53ce8b355e910...
[ios] - fix libmpeg2 PIC asm by including upstream patch - this is the real fix for the ios7 crash when loading libmpeg2 (and by reverting the former uncorrect fix this also fixes the kernel panic which occured on atv2 running ios5 and older ...)
Merge pull request #4184 from popcornmix/pisink_supported

[pisink] Report supported passthrough formats
Merge pull request #4185 from Montellese/fix_empty_tvshow_crash

videolibrary: fix crash when entering an empty tvshow
libdvdcss-1.2.12 removed _XBOX unneeded patches
libdvdcss-1.2.12 updated diff files
libdvdcss update to 1.2.13 - incl diff file
libdvdread-libdvdnav update to 4.2.1