Fix error at login page, update i18n/conf
Fix error at login page, update i18n/conf
Merge remote-tracking branch 'origin/develop' into local-develop