refactored login, added menuitems
Merge branch 'develop'
merged develop