Merge pull request #169 from annando/master

Design improvements for importing posts from twitter, facebook and G+
Public Server: indented the example options in the README
Merge pull request #170 from tobiasd/20131220-public_server

Public Server: indented the example options in the README
public server: added template for the admin panel
public server: added form to admin panel
public server: save the settings
public server tar ball
Merge pull request #171 from tobiasd/20131220-public_server_adminpanel

added the config option of the public server addon to the admin panel
Merge pull request #172 from annando/master

Unique contacts, bugfix in fbpost and better handling of avatars and cached data in privacy_image_cache
Merge pull request #173 from annando/master

pumpio: Unique contacts are now filled as well.
diaspora: New posting connector for Diaspora