Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixes issue #326 initial scale to big
updated fr translation
PT-BR: update to the strings
Merge pull request #328 from tuscanhobbit/master

PT-BR: update to the strings
title missing in private mention posts
Merge https://github.com/friendica/red into zpull
Merge pull request #327 from git-marijus/master

fixes issue #326 initial scale to big
code cleanup
Merge https://github.com/friendica/red into zpull
small changes to a couple of lookup functions which we need to use a bit more
fix login weirdness for accounts that need to be approved
move jgrowl (alert popup) out of the now taller navbar
SECURITY: do not automatically open an iframe which points into the local website.