Merge pull request xbmc#4793 from MartijnKaijser/13.1

13.1

Merge pull request xbmc#4664 from Montellese/broken_checks

fix broken comparisons
Conflicts:
	xbmc/settings/windows/GUIControlSettings.cpp

Merge pull request xbmc#4651 from MartijnKaijser/ios-atv2_bump

Ios atv2 bump

Merge pull request xbmc#4642 from wsnipex/linking-fix

Linking fix [fixes xbmc#15139]

Merge pull request xbmc#4602 from opdenkamp/pvrgotham

[PVR] bump add-ons

Merge pull request xbmc#4578 from davilla/fix-mediacodec

[droid] fixed stutter under MediaCodec. We need to wait a little longer before we think the frame is late

[lang] update of skin.confluence language files

Merge pull request xbmc#4428 from Montellese/jsonrpc_optional_logging

JSON-RPC: make logging of incoming requests optional and configurable