WebUI: Added placeholder help text and image for Debugging tab
tvhlog.js: Option grouping for consistency with rest of interface; correction of option label capitalisation
dvr.js: Add local sort capability to recording lists
Better usage infos for sat_xml_scan.py
Merge pull request #400 from ckarrie/patch-1

Better usage infos for sat_xml_scan.py
Merge pull request #399 from ProfYaffle/master

WebUI: Option grouping and help text in 'Debugging' tab; sort option in recording lists (upcoming/finished/failed)
intlconv: use iconv for utf8 conversions
dvr: add the filename charset conversion from UTF-8
dvr: remove duplicate clean title code, use '_' for the unknown chars
Add channel UUID to JSON response
Merge branch 'osx' of git://github.com/dmarion/tvheadend into master
intlconv: osx requires -liconv
dvr.js: Adjust spacing to prevent word wrap on some browsers
Merge remote-tracking branch 'upstream/master'
dvr.js: Adjust spacing to prevent word wrap on some browsers
Merge pull request #404 from ProfYaffle/master

dvr.js: Adjust option spacing as per comment in PR 396
Merge pull request #402 from dmarion/upstream

intlconv: osx requires -liconv
api: fix crash on passing on no subsystem
osx: fix interface selection for ipv4 multicast joins