Merge pull request #24 from ZooTypers/master

pulling lindseys changes
last commit for phase2, fixes the login popup crashes
Merge pull request #136 from winglam/master

 last commit for phase2, fixes the login popup crashes