Active channels are now listed on parent channels
Merge branch 'angular' of https://github.com/jafna/sortit-app into angular