Add support for serieslinkUri in eventAdd and eventUpdate messages
First attempt at multiple server support.  Use --host2 parameter to set a second server.  Channel lists from all the servers (the code supports an unlimited number, but the configfile code  only allows two for now) are merged based on the channel number (LCN).
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into onscreenepg

Conflicts:
	channels.c
	channels.h