partially addressed a change in AES encrption (to be finished)
Merge branch 'devel' of github.com:globaleaks/GLBackend into devel

Conflicts:
	globaleaks/security.py