settings: fix conflict of <minimum> and <maximum> for CSettingList
ActiveAE: use keep alive timer when stream is paused
ActiveAE: add windowing callback for application focus change
[osxsink] - properly set the ae device type based on either ca or heuristical criteria - fixes DisplayPort not detected as LPCM capable and maybe others

Conflicts:
	xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
[osxsink/iossink] - don't block addpackets if ca didn't do the initial data pull - but timeout gracefully for signaling an error condition to the engine (use a timer for detecting a real timeout as condvar can be signaled by spurious interrupts)
Merge pull request #4347 from FernetMenta/aefixes

ActiveAE: fix for iOS - suspend sink when paused and app is not focused
Merge pull request #4348 from Memphiz/osxdisplayportbp

 [osxsink] - properly set the ae device type based on either ca or ...
Merge pull request #4349 from Memphiz/noblockaddpacketsbp

[osxsink/iossink] - don't block addpackets if ca didn't do the initial d...
[paplayer] Prevent possible division by zero in MP3Codec.
Merge pull request #4364 from ace20022/pap_zero_gotham

[paplayer] Prevent possible division by zero in MP3Codec.
URIUtils: fix out of range exception in resolvePath()
Merge pull request #4365 from Montellese/settinglist_minmax_conflict

settings: fix conflict of <minimum> and <maximum> for CSettingList
Merge pull request #4366 from Montellese/uriutils_resolvepath_fix

URIUtils: fix out of range exception in resolvePath()
fix compile warnings
[python] fix extended progress bar double closure. fixes #14985
remove useless log line
Merge pull request #4277 from xhaggi/fix-recordings-parent-dir

[pvr] fix: duplicate parent dir item for recordings
[osx] fixed missing line in backport 9a05eed
Merge pull request #4328 from koying/fixcontextcrash

FIX: set logger to NULL when the XBMC::Context is deleted
[exif] use unknownToUTF8 for the EXIF_COMMENT_CHARSET_ASCII/UNKNOWN case as many pictures store non-ascii here. fixes #14188