Merge branch 'hotfix/fix_dbconnect'
Merge branch 'develop'
change db name, login error highlight