Better usage infos for sat_xml_scan.py
rename uuid_t to tvh_uuid_t
osx: initial support for OS X
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
dvr.js: Adjust spacing to prevent word wrap on some browsers
Merge remote-tracking branch 'upstream/master'