changed index and added login
fixed merge
Merge branch 'master' of https://github.com/OPAL-DEVICE/unstable-asteroid