WIP
Display channels based on video updated timings
Added featured condition
merged with master
Merge branch 'master' into issue-110

Conflicts:
	hgtv/models/channel.py