more tweaks
Merge pull request #339 from tuscanhobbit/master

Wrong logo on assets/home page
Update channel permissions to full ints
Also update database.sql
allow personalised page layouts for modules.
Merge https://github.com/friendica/red into zpull
move bootstrap to theme and out of core.
more chatroom discovery
Fix the weirdness of messages appearing in the middle of the screen
and working their way downwards one comment at a time as the ping runs
when joining an active chat room.
Merge pull request #340 from beardy-unixer/master

Fix the weirdness of messages appearing in the middle of the screen
put bookmarked chatrooms into poco
Merge https://github.com/friendica/red into zpull
I'll have to fix this someday.
comanche: provide an option to add a menu class for different theming choices on some menus (e.g. horizontal, tabbed, etc.)
properly fix profile edit dropdown menu
little correction
Revert "little correction"

This reverts commit 496a5a556f85c724d2fef3e465c675e34639dc10.
Merge pull request #341 from git-marijus/master

properly fix profile edit dropdown menu
vsprintf error
Merge https://github.com/friendica/red into zpull