addressed issue/316
Merge branch 'issue/316' of github.com:globaleaks/GLBackend

Conflicts:
	globaleaks/__init__.py