Merge branch 'refs/heads/0.6'

Conflicts:
	docs/source/backends.rst
	docs/source/conf.py
	docs/source/devguide.rst

diff --cc snf-astakos-app/astakos/im/api/admin.py
index 15087bb,27d4f12..1c5642a
--- 1/snf-astakos-app/astakos/im/api.py
--- 2/snf-astakos-app/astakos/im/api/admin.py
+++ b/snf-astakos-app/astakos/im/api/admin.py
@@@ -247,18 -247,6 +248,6 @@@ def get_user_by_username(request, user_
      # Error Response Codes: internalServerError (500)
      #                       badRequest (400)
      #                       unauthorised (401)
-     userid = request.GET.get('userid')
-     if not userid:
-         raise BadRequest('Userid missing')
-     try:
-         user = AstakosUser.objects.get(username = userid)
-     except AstakosUser.DoesNotExist, e:
-         raise BadRequest('Invalid userid')
-     else:
-         response = HttpResponse()
-         response.status=204
-         user_info = {'userid':user.email}
-         response.content = json.dumps(user_info)
-         response['Content-Type'] = 'application/json; charset=UTF-8'
-         response['Content-Length'] = len(response.content)
-         return response
+     #                       forbidden (403)
+     #                       itemNotFound (404)
 -    return _get_user_by_username(user_id)
++    return _get_user_by_username(user_id)

diff --cc snf-astakos-app/astakos/im/functions.py
index b854b24,172e712..877acd4
--- 1/snf-astakos-app/astakos/im/functions.py
--- 2/snf-astakos-app/astakos/im/functions.py
+++ b/snf-astakos-app/astakos/im/functions.py
@@@ -214,4 -267,9 +267,9 @@@ class SendGreetingError(SendMailError)
  class SendFeedbackError(SendMailError):
      def __init__(self):
          self.message = _('Failed to send feedback')
-         super(SendFeedbackError, self).__init__()
+         super(SendFeedbackError, self).__init__()
+ 
+ class ChangeEmailError(SendMailError):
+     def __init__(self):
+         self.message = _('Failed to send change email')
 -        super(ChangeEmailError, self).__init__()
++        super(ChangeEmailError, self).__init__()

diff --cc snf-astakos-app/conf/20-snf-astakos-app-settings.conf
Simple merge