capmt: fix crash while trying to open iptv channel with capmt enabled
Add missing command line options to the man page.
Allow binding address to be specified via --bindaddr flag.
cwc: fixed problem with changed CA pids by provider and prefered CA pid
cwc: reset prefcapid if service can't be descrambled
cwc: cleanups and better debug logging
build: update build system to fix some odd use cases
ui: fix previous mod that broken channel configuration editing

I made the change so that /channels returned the imagecache icon
while I was testing some other UI code. Unfortunately that breaks
channel editing. So I've added a second (possibly confusingly named)
field.
Merge remote-tracking branch 'origin/pr/245'
Merge remote-tracking branch 'origin/pr/246'
Merge remote-tracking branch 'origin/pr/247'

Conflicts:
	man/tvheadend.1
Merge remote-tracking branch 'origin/pr/251'
dvb: fix bug causing failures in service discovery using SDT
build: fix mistakes in previous build system updates
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:EricV/tvheadend