added import for localized templates from glclient appdata
addressed issue https://github.com/globaleaks/GlobaLeaks/issues/926
fixed a bug related to a bad merge
Merge branch 'devel' of github.com:globaleaks/GLBackend into devel