Adding new views
Adding channels database layer
Merge remote-tracking branch 'origin/master'