Merge remote-tracking branch 'upstream/master'
template_processor: add filter support to variables
New caching system for photos
vier: Expanding and collapsing now works
vier: Added Delegations and optical changes.
Modify nginx sample to a real config file
Fix rewrite rules to pass arguments
Fix location regex for extensions to end with $
Add more comments
Typos
Merge pull request #544 from oohlaf/nginx

Nginx
Merge pull request #543 from fabrixxm/master

template_processor: add filter support to variables
divide by zero on incorrectly specified oembed thumbnail size
Merge https://github.com/friendica/friendica into pull
bbcode: New element "share" for shared content
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
Merge remote-tracking branch 'upstream/master'
DE: update to the strings
PL: update to the strings
vier: The alt-pager and the birthday- and eventreminder is optically improved
mailimport: Bug that prevented mails to be imported
mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header.
Merge pull request #545 from annando/master

New bbcode: "share", caching of photos and some changes to "vier"