fix login
fix validation in edit mode,fix navigation, fixes #25
Merge branch 'master' into sami_ver1