first version of channel route refactoring
Channel Route management refactoring
manual merge from master
code cleanup
Merge pull request #172 from jembi/channel-route-management

Channel route management refactoring - closes #160