Merge remote-tracking branch 'upstream/master'
bug #517 - ensure wall owner can always comment on walltowall posts to their own wall, this seems to have been lost during the objectification of conversations
add sample nginx config from Olaf Conradi to mods directory
nginx config update
anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported.
prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists -
Contacts will be pruned when creating the editor. They can't be added with the ACL selector,
but we won't prevent them from being added through other means.
Allowed groups will be pruned on item submit.
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