applied various english corrections thanks to the review by strel.
applyed manually minor fixes of master to avoid conflicts
Merge branch 'master' of https://github.com/globaleaks/GLClient into bootstrap3-update

Conflicts:
	app/views/admin/advanced.html
	app/views/admin/contexts.html
	app/views/receiver/preferences.html