Merge pull request #1 from ZooTypers/master

oakpull
Merge pull request #2 from ZooTypers/master

update me
"score and multileaderboard tests"
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers
Merge pull request #181 from dyxliang/master

Updating the different tests (leaderboard tests) and improving them.
Merge pull request #182 from dyxliang/master

Adding test for the options menu and fixing SP and LB tests.
Merge pull request #4 from ZooTypers/master

pull
intermediate addition of friends
Merge pull request #183 from littlpunk/master

intermediate addition of friends
Merge pull request #25 from ZooTypers/master

update
"splash screen, no title bar in xml instead of code, multiplayer leaderboard testing, testing database"
Merge pull request #3 from ZooTypers/master

update oak
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers

Conflicts:
	ZooTypers/bin/ZooTypers-git.apk
	ZooTypers/src/com/example/zootypers/ui/Leaderboard.java
finish mleaderboardtest
Merge pull request #184 from oaknguyen/master

"update head with splash, no title in xml, multiplayerleaderboard test,
new error + multi opp uname + no type on pause
merged
lb connect error layout
Merge pull request #186 from cdallas/master

lb error + mult uname
Merge pull request #1 from ZooTypers/master

Getting most recent version.