addressed issue https://github.com/globaleaks/GlobaLeaks/issues/1007

@hellais this is the twin pull request of https://github.com/globaleaks/GLClient/pull/133

comments regarding the pull are on the other pull request.

can you take care of the integration of both?