Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #330 from git-marijus/master

cleanup style.css
Merge remote-tracking branch 'upstream/master'
first few German help files
small corrections
changed old Friendica stuff to what we have now in Red
Merge pull request #331 from git-marijus/master

update bootstrap and revert some style.css cleaning
Merge pull request #332 from zzottel/master

First steps at German doco
doc update
strings/version update
Merge https://github.com/friendica/red into zpull
prevent mod/cloud looping (ping gets a new session on each call [wtf?] which triggers our "changed uid" detector)
DE: update to the strings
Merge pull request #333 from tobiasd/20140222

DE: Update to the strings
Add option for narrow navbar instead of the bootstrap default

thick version