fixed login
merging from master
Merge pull request #63 from mud-turtles-2014/fix_login

fixed login