more tweaks
Typo
add hover effect to usermenu caret
a little fix against bootstrap 3.1.1
Revert "a little fix against bootstrap 3.1.1"

This reverts commit e82c9eb176541b42c9ea00828d4d1a7f1231743b.
Merge branch 'master' of https://github.com/friendica/red
first draft of creating templates documentation
Merge pull request #346 from git-marijus/master

css fixes
Merge pull request #347 from solstag/master

Update pt-br translation.
it's unfortunate that we use the term "layout" to refer both to a template file and to Comanche .PDL files. I think we should probably refer to the template file as "template" just to avoid confusion. For the moment we'll provide both, since the 'layout' is already in the wild. But please use "template" going forward.
change the docs for template tag
Merge https://github.com/friendica/red into zpull
s/layout/template/g *.pdl
allow templates to have multiple styles - this would be a bit like having a schema for a template file. At first you'll think this is insane and overly complicated, you'll just have to wait and see what I'm up to. Then it will start to make sense.
Merge branch 'master' of https://github.com/friendica/red
make navbar themable again
Merge pull request #350 from git-marijus/master

make navbar themable again
first cut at choklet template
add choklet template with several defined flavours, two and three column fluid layouts with optional side margins and a region for a blog-style header photo
add choklet to the comanche docs