Added login layout and correct layout
Merge branch 'develop' into ViewWineActivity