test naming corrections.
Merge branch 'master' of ssh://github.com/globaleaks/GLClient

Conflicts:
	api/A7.js