Added encryption column to configuration->TV Adapters->Services. Added additional caidnametab entry.
Fix javascript error (typo) spotted by andyb2000
imagecache: fix mistake in imagecache address checking.

This will still may not work if the server is behind a proxy, as this
could lead to the wrong IP being detected.

For clients with HTSPv7 support they will only get the /imagecache/ID
part of the URL and will have to add the rest.

Note: there will be a number of clients that may report v7 support
but not be fully compliant due to the release schedules etc... users
in this position will not be able to use the image caching.
htsp: make DVR file open compatible with webui URLs.
imagecache: fix re-fetch period mistake.
htsp: bump version to 8

New imagecache URLs will break XBMCs pvr.hts which already reports v7.
Merge remote-tracking branch 'origin/pr/204'
Merge remote-tracking branch 'tvheadend/tvheadend/master'
capmt: don't start when disabled
imagecache: another silly mistake in timer periods.
Minor addition to the way the server capabilities are checked.
support: some minor updates to python lib and htspmon.
htsp: provide webroot in htsp hello message.
http: fixed mistake since I changed webroot variable.
Update documentation resource (capmt)
mkv: make sure the first cluster timecode is 'close to zero'.

when recording to disk, the subscription is started ~30s before the
scheduled event actually starts. This causes the pts time stamps to have an
offset of about 30s. This patch moves the start time filter condition
from the end of the pipeline to be a configurable property of the tsfix pipe.
dvr: rearrange the pipes so that globalheaders gets the packets before tsfix (and the start time filter).
Merge remote-tracking branch 'origin/pr/205'
Fix #1497 - Added error checking if 'git describe --dirty' is not supported by the host.
muxers: re-org to clean up dirs.