Merge branch 'develop' into styling-branch
login html changes
fixed merge conflict