show context when navigating
rename channel category to channel folder
Merge remote-tracking branch 'upstream/master'