Merge branch 'template_locales'
Conflicts: templates/webpages/admin/edit_user_master.html templates/webpages/admin/list_users_de.html templates/webpages/is/form_header_master.html
Merge branch 'template_locales'
Conflicts:
templates/webpages/admin/edit_user_master.html
templates/webpages/admin/list_users_de.html
templates/webpages/is/form_header_master.html