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 'feature/localized_mails_templates_inclusion' into devel
Merge branch 'feature/localized_wizard' into devel
implemented support for https://github.com/globaleaks/GlobaLeaks/issues/949
x_frame_options now accepts confiogurations only for deny and allow-from modes