optimize two if conditions
Merge pull request #4662 from Montellese/jsonrpc_addon_versioning

json-rpc: auto-generate xbmc.json/addon.xml
[gui] auto height textboxes should take into account the cell height of the last row, which may be more than the lineheight for well-spaced fonts
[musicdb] drop unused function
StringUtils: adjust Split() to return an empty array if the input string is empty
jsonrpc: bump API version because 4572e062fd7ba831c513d0d842b42282115fb9e4 might affect some clients
Startup log: rearrange info for better readability
"x86 Linux 32-bit" -> "Linux x86 32-bit"
SystemInfo: add MIPS64 detection (for consistency)
Startup log: report OS similarly to platform ("Linux 32-bit" -> "Linux x86 32-bit")
* Add CSysInfo::GetKernelCpuFamily() function

Conflicts:
	xbmc/Application.cpp

Conflicts:
	xbmc/Application.cpp
[coreSubs] restore default subtitle offset
Merge pull request #4672 from anssih/fix/dvdplayer-samplerate

dvdplayer sample rate fixes
Merge pull request #3990 from Karlson2k/startup_log_mod_01

Better readability for startup log
Merge pull request #4664 from Montellese/broken_checks

fix broken comparisons
AESinkPULSE: Make clear what we open - makes logfiles better readable
Merge pull request #4685 from fritsch/pacork

AESinkPULSE: Make clear what we open - makes logfiles better readable
fix shadowed variable in CSetting::Deserialize()
CGUIDialogAudioSubtitleSettings: fix possible loss of data warnings
Merge pull request #4677 from Montellese/videodb_empty_arrays

StringUtils: adjust Split() to return an empty array if the input string is empty
Merge pull request #4582 from koying/chgamcblacklist

CHG: [mediacodec] switch to a surface render black list + backup AS
Merge pull request #4675 from jmarshallnz/seconds_to_hours

Seconds to hours