partial delivery refactor and usage of encrypted files
Merge branch 'devel' of github.com:globaleaks/GLBackend into devel

Conflicts:
	globaleaks/tests/helpers.py