Merge remote-tracking branch 'origin/development' into development
Set userLang variable in bootstrapper for logged in user