A2 test updated in relation to commit https://github.com/globaleaks/GLBackend/commit/618822dcd3e2c3ab8cb04e60f14ce2e2f672082d
Merge branch 'master' of github.com:globaleaks/GLClient

Conflicts:
	api/A2.js