Merge pull request #1 from ZooTypers/master

pulling
Merge pull request #2 from ZooTypers/master

pulling
Merge pull request #4 from ZooTypers/master

pulling
Merge pull request #5 from ZooTypers/master

pulling
Merge pull request #6 from ZooTypers/master

pulling
not done yet
android
Merge pull request #60 from littlpunk/master

sorry not done yet.. i just need someone to check if they can type in login box