Merge branch 'development' into ava
fix URL for language switch
Merge branch 'ava' into development