fixed login bugs
fixed merge
Merge pull request #37 from myclamm/mainCtrlLogin

logout button added