removed etags and fixed few stuff
Merge branch 'devel' of github.com:globaleaks/GLBackend into devel

Conflicts:
	globaleaks/handlers/collection.py