Merge pull request #134 from nhlien93/master

pushing comments up to master
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
committing apk
Merge pull request #137 from winglam/master

committing apk!
code has been ran through codepro
Merge pull request #138 from winglam/master

code has been ran through codepro
Merge pull request #26 from ZooTypers/master

getting the beta version