Merge branch 'origin/develop'
Updated password for admin account
Finish login