Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  string update
  implement contact archival
  archive contact flag
  pass zrl to dfrn_request as fallback
  rev update
  another attempt to fix lower tab behaviour on small screens, community back in tab area

* master:
fix #search-text

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  break up poller into separate processes
  add tooltip title to common_tabs
  PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
  Diabook-dark update, it's almost useable now (if you're lenient).
  Added "important changes" to admin menu for admins who don't follow the github properly.

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  poller refactor: continue not valid in this context

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  a few more continues that should be returns
  small bugfix. sometimes also avatar pics were rescaled

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  provide "xxx joined yyy" notifications
  adding META viewport tag for better look on tablets
  Update Esperanto to 100%
  DE update to the strings
  activitystreams schema constants for "join group"
  missed a db field
  typo in profile_selectors, fix remote tagging
  not all profile selector choices have unique or direct translations
  log db error strings in all cases
  admin page to manage failed updates
  improved db error logging
  close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)

* master:
change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-api

Bug in StatusNet API
diabook-themes: add "community profiles"-box to right_column
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: add "community profiles"-box to right_column
  change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
  make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
  diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
  rev update
  start adding tooltips to tab menus
  fix join group notifications

* master:
sub-minor change to head.tpl

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #280 from simonlnu/master

added a / for consistency's sake ;p
hidden plugins (add .hidden file to dir)
Merge https://github.com/friendica/friendica into pull
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  hidden plugins (add .hidden file to dir)

* master:
lighten bg and darken font on dispy light

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #281 from simonlnu/master

font and background adjustments
adding zrl support to social graphs
Merge https://github.com/friendica/friendica into pull