Merge branch 'master' of https://github.com/appsgate2015/appsgate

Conflicts:
	sources/appsgate-client/app/locales/fr/translation.json
Merging translation