fixed format of app.js
fixed conflicts
Merge branch 'next-happy' into next-alex
fixed merge conflicts and channels list is working
linked to channels from channels list
working on create channels
new channels is almost working
change manage button
add channels working
fixing css
updated channels list page
merging alex changes