Merge branch 'development'
update translations
Merge branch 'bugfix-updatetranslations' into development