Merge pull request #4608 from Montellese/gui_slider_cleanup

CGUISliderControl: some cleanup and fixes
Merge pull request #4606 from Montellese/upnp_fixes

upnp: some fixes
Merge pull request #4596 from Montellese/jsonrpc_properties

jsonrpc: expose specialsortseason and specialsortepisode for episodes
fix resume behavior for plugins with stack  

Resume behavior for local files (.-partN) are not corrupted.
http://forum.xbmc.org/showthread.php?tid=192690
[jenkins] - enable-neon for android
Merge pull request #4616 from kit500/master

fix resume behavior for plugins with stack
Merge pull request #4601 from jmarshallnz/play_media_sort_order

[builtins] PlayMedia() should use a sort order appropriate for the items
[gui] fix incorrect parsing of relative <width> and <height> tags
[gui] save and restore the current focused control in LoadSkin rather than ReloadSkin
[gui] move fallbacks to default skin up to the ReloadSkin functions. Fixes #15131
[cosmetic] remove unused m_skinReloading variable
Merge pull request #4531 from Black09/container-isupdating

Added Container.IsUpdating
Merge pull request #4033 from xhaggi/pvr-listitem-isactive

[gui] adds listitem info label inprogress to determine if epg item is in progress
[epg] refactor CalcuateLayout() into UpdateLayout() and the free item
memory stuff in it's own method
jsonrpc: prepare for compile-time generated ServiceDescription.h
Merge pull request #4107 from Voyager1/libdvd-update

Libdvdread and Libdvdnav update to latest version 4.2.1 - Libdvdcss to 1.2.13
Merge pull request #4603 from jmarshallnz/skin_load_cleanup

Skin load cleanup
[fix] OSD auto-hide not working on some Win comps

This fix will allow OSD to auto-hide on those Windows machines that
generate regular spurious WM_MOUSEMOVE messages without any changes in
the mouse position.
Merge pull request #4565 from xhaggi/epg-grid-cleanup

[epg] cleanups/refactoring for CGUIEPGGridContainer
Merge pull request #4615 from bombizombi/master

Fix for OSD auto hide not working