minor fixes
Merge branch 'master' of https://github.com/globaleaks/GlobaLeaks

Conflicts:
	scripts/build-glbackend.sh