Merge pull request #1 from tvheadend/master

sync with main repository
scraping season/episode numbers for sky-it

Extended the already present hack to extract such numbers from episode descriptions in Sky IT EPG data.
improved regexs management

As suggested by perex, moved patterns and regexs as global variables and their management in opentv_init/opentv_done.
several adjustments

- make use of ARRAY_SIZE macro;
- missing static keyword for global variables;
- better patterns for sky-it with possibility to support a description without season specification;
- debug messages;
Merge pull request #478 from diraimondo/master

scraping season/episode numbers for sky-it
Webui: restore channel tag functionality to EPG query and autorec
Merge pull request #480 from ProfYaffle/master

Webui: restore channel tag functionality to EPG query and autorec
scanfile: add support for new linux dvb file format
intlconv: Do not free alloca-ted string
avahi: make sure that mallocated path is freed
DVR: Fix the autorec minduration/maxduration
WEBUI: Do not show the access state if --noacl is active
service: fix the mutex deadlock at shutdown in service_saver() thread fcn
Webui: Align epg duration filter with autorec grid values
Merge pull request #481 from ProfYaffle/master

Webui: Align epg duration filter with autorec grid values
[htsp] bump htsp version
[htsp] allow clients to get/set dvr priority and retention
[htsp] add some more DVR fields
[htsp] send actual pre/post times and retention
[htsp] add autorec support