Merge pull request #4522 from Montellese/platinum_missing_patch

platinum: add missing patch file
Merge pull request #4517 from t-nelson/no_invisible_or_disabled_settings_for_json

Don't expose invisible settings to JSONRPC
Merge pull request #4523 from koying/fixamcinitformat

FIX: [mediacodec] proper initialization of output format
Merge pull request #4533 from Memphiz/removetoast

[gl/gles] - remove annoying kai toast in videofilter fallback case
Merge pull request #4514 from joethefox/jsonrpc_subtitle_addontype

JSON-RPC: add "xbmc.subtitle.module" enum in the json-rpc Addon.Types se...
Merge pull request #4297 from maxwellito/wiimote_battery_fix

Fix Wiimote battery problem
Merge pull request #4535 from Memphiz/fixchannelmap

[osxsink] - fix bad access when device announces more then 8 channels - ...
Merge pull request #4524 from koying/fixamcinbuffer

FIX: [mediacodec] reset if we are out of input buffers
Merge pull request #4503 from popcornmix/texture_leak

[rbp] Fixes for hangs and leaks in jpeg->texture code
Merge pull request #4534 from popcornmix/dvdplayer_merge

[omxplayer] merge missed commits from dvdplayer
Merge pull request #4541 from xhaggi/continue-last-channel-on-wakeup

[pvr] continue last played channel on wake up
Merge pull request #4350 from Memphiz/iosbgmusic

[ios] - restore the music background playback ability
Merge pull request #4545 from Memphiz/nfsexportlist

[win32] - nfs fix
Revert "[osx] drop outputbuffer index and iterate over them all"

This reverts commit b9a1d07a7d1a2bec3bb094b97cc7d96a325b9b98.

Conflicts:
	xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
[darwinsink] - use fixed outputbuffer with idx 0