updated login page
Merge branch 'develop' into ViewWineActivity