Merge pull request #4500 from FernetMenta/aefixes

Revert "paplayer: use position based seeks for ffmpeg demuxer"
Merge pull request #4494 from davidbanham/master

Add keyboard controls to web remote
Merge pull request #4508 from Montellese/settinglist_default_fix

settings: fix detection of value changes in CSettingList
Merge pull request #4504 from FernetMenta/paplayer

paplayer: rewind stream after init (ffmpeg codec)
Merge pull request #4502 from fritsch/pa-revisit-volume2

AESink: Revisit volume part 2
Merge pull request #4510 from FernetMenta/aefixes

ActiveAE: verify resample context before using it
Merge pull request #4489 from Orochimarufan/sslcipher

Make the allowed SSL Ciphers a protocol option for CurlFile.
Merge pull request #4519 from astiob/ass_read_memory

Fix libass ass_read_memory() signature
Merge pull request #4525 from joethefox/ae_zero_volume

ActiveAE: set the scaled volume to zero if the volume is zero
Merge pull request #4511 from fritsch/pa-sample-48000

AESinkPULSE: Let PA handle whatever samplerate we have
Merge pull request #4520 from ronie/confluence-livetv

[Confluence] next/previous fixes for livetv - fixes #15076
Merge pull request #4521 from jmarshallnz/playmedia_order

[builtins] PlayMedia didn't sort the folder prior to adding to playlist
Revert "[osx] drop outputbuffer index and iterate over them all"

This reverts commit b9a1d07a7d1a2bec3bb094b97cc7d96a325b9b98.

Conflicts:
	xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp