Merge pull request #4478 from Montellese/upnp_controller

Two UPnP controller related fixes
Merge pull request #4530 from FernetMenta/resolution

fix toggle fullscreen during video playback
Merge pull request #4548 from wsnipex/logging-fix

fix incorrect logging when using static ffmpeg
Merge pull request #4552 from tobbi/german-fixes

Fix spelling of "Liechtenstein" in langinfo.xml
Merge pull request #4555 from FernetMenta/musicosd

fix flickering music OSD
Merge pull request #4491 from ruuk/ignorecache

Added optional parameter 'ignoreCache' to xbmc.playSFX()
Merge pull request #4560 from arnova/sub_nosort

changed: Don't try to sort subtitles, it screws up eg. sync priority
Merge pull request #4551 from Montellese/settings_language_fix

fix crash when changing language from non-GUI thread (fixes #15113)
Merge pull request #4563 from FernetMenta/aefixes

ActiveAE: check suspend state before creating a stream
Merge pull request #4562 from FernetMenta/flac

ffmpeg backport: improve seeking in flac files
Merge pull request #4559 from koying/fixdroidpassthrough

FIX: [droid] allow all boxes to enable passthrough (frodo way)
Merge pull request #4553 from stefansaraev/upnp-settings

[settings]: fix upnp category visibility when built with --disable-upnp
Merge pull request #4558 from koying/revert

Revert "FIX: [mediacodec] reset if we are out of input buffers"
Merge pull request #4537 from bkuhls/uclibc

[uClibc] Fix compilation on arm
Merge pull request #4556 from MartijnKaijser/pydoc_fix1

[pydocs] fix pydocs line ending and add additional information regarding...
Merge pull request #4554 from stefansaraev/webserver

dont show kaitoast error when compiled with --disable-webserver
Merge branch 'Gotham' of git://github.com/xbmc/xbmc into Gotham

Conflicts:
	xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
Merge pull request #4549 from koying/fixamcinitcolor

FIX: [mediacodec] fixup initial output format for software rendering
Merge pull request #4550 from koying/fixstfinbufsize

FIX: [stagefright] adjust input mediabuffer size
Merge pull request #4527 from Jalle19/fix-timeline-navigation

[epg] Fix navigating to the sidebar with cursor keys