Merge pull request #4493 from Memphiz/airplaypicvolume

[airplay] - fix unwanted volume restore
Merge pull request #4488 from FernetMenta/paplayer

paplayer: use position based seeks for ffmpeg demuxer
Merge pull request #4495 from FernetMenta/aefixes

WASAPI: add 192khz sample rate in case we added HD formats
Merge pull request #4498 from popcornmix/reschange

[settings] Only need a confirmation dialogue when resolution has changed
[webui] Profiles tab is not deselected
Merge remote-tracking branch 'upstream/Gotham'
Some enca changes
Merge pull request #4501 from sagiben/Gotham

Profiles tab is not deselected
Merge remote-tracking branch 'upstream/Gotham'
Merge branch 'master' of https://github.com/quasar1/boxeebox-xbmc
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