zapit/src/bouquets.cpp: decrease channel lock count in deleteBouquet();
add setBouquetLock() with change channel lock count
zapit/src/channel.cpp: add bLocked flag to lock single channel
zapit/src/bouquets.cpp: do not add webtv channels to 'Other' bouquet
gui/channellist.cpp: add per-channel lock in editor
Merge remote-tracking branch 'cool-cst-next/cst-next'