Merge branch 'master' into settings

Conflicts:
	diaspy/__init__.py

diff --cc diaspy/__init__.py
index 1050ee89b8b02331a313f924faf55e9405e57527,0d3caa3de47f7435c3e44b9024c2918e7d17471f..c12c783a072ed3d5a13d0d37ef7eafc04349940e
--- 1/diaspy/__init__.py
--- 2/diaspy/__init__.py
+++ b/diaspy/__init__.py
@@@ -4,4 -4,6 +4,7 @@@ import diaspy.streams as stream
  import diaspy.client as client
  import diaspy.people as people
  import diaspy.notifications as notifications
 +import diaspy.settings as settings
+ 
+ 
+ __version__ = '0.2.0'

diff --cc diaspy/settings.py
index a63a801821208d9549b93584eaff515c5a72c9e1,0000000000000000000000000000000000000000..24dc92fb5757e84ccda9d43786f67a00e520577a
mode 100644,000000..100644
--- 1/diaspy/settings.py
--- /dev/null
+++ b/diaspy/settings.py
@@@ -1,20 -1,0 +1,19 @@@
- 
 +import json
 +import re
 +import urllib
 +
 +
 +"""This module provides access to user's settings on Diaspora*.
 +"""
 +
 +
 +class Settings():
 +    """This object is used to get access to user's settings on
 +    Diaspora* and provides interface for downloading user's stuff.
 +    """
 +    def __init__(self, connection):
 +        self._connection = connection
 +    
 +    def downloadxml(self):
 +        request = self._connection.get('user/export')
 +        return request.text