change config
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Change login page
Merge branch 'master' into dev
Update login