#61 Bugfix: language change not working on first time when logged in
Merge remote-tracking branch 'origin/development' into development