uk lang for tv-channels
Merge branch 'master' of https://github.com/eshikerya/localnet

Conflicts:
	data/content-data/channels.yaml