joseph's stuff 2
Merge branch 'master' of https://github.com/BU-HuangJ/angrybots_android_app

Conflicts:
	workspace/.metadata/.log
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1/c10fd94566a800121d8ec4fe66808e74
	workspace/AngryBots/bin/AngryBots.apk
	workspace/AngryBots/bin/classes.dex
	workspace/AngryBots/bin/classes/DB/AndroidDB.class
	workspace/AngryBots/bin/classes/Messaging/Client.class
	workspace/AngryBots/bin/classes/adapters/MemberAdapter.class
	workspace/AngryBots/bin/classes/adapters/NetworkAdapter$1.class
	workspace/AngryBots/bin/classes/adapters/NetworkAdapter$2.class
	workspace/AngryBots/bin/classes/adapters/NetworkAdapter.class
	workspace/AngryBots/bin/classes/adapters/PersistentSettings.class
	workspace/AngryBots/bin/classes/base/Member.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/AngryBotsProfile.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/Leaderboard.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/LoginActivity$UserLoginTask.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/LoginActivity.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MainActivity.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame2$1.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame2.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/R$drawable.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/R$id.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/R$layout.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/R$menu.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/R$string.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/R$style.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/RobotCompetition.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/RobotLeaderboard.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/RobotMap.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/RobotProfile.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/RobotSettings.class
	workspace/AngryBots/bin/dexedLibs/android-support-v4-59c10dcb152ec2f0768ee227e787dc00.jar
	workspace/AngryBots/bin/dexedLibs/android-support-v4-a62eb4da1648f989d5a3597950355dfe.jar
	workspace/AngryBots/bin/dexedLibs/android-support-v4-a7c0e22b8e874d558e23a7a0fc019cb6.jar
	workspace/AngryBots/bin/resources.ap_
	workspace/AngryBots/gen/com/group3/angrybots/R.java
	workspace/AngryBots/src/adapters/PersistentSettings.java
	workspace/AngryBots/src/com/group3/angrybots/LoginActivity.java
	workspace/AngryBots/src/com/group3/angrybots/MainActivity.java
	workspace/AngryBots/src/com/group3/angrybots/RobotCompetition.java
	workspace/AngryBots/src/com/group3/angrybots/RobotLeaderboard.java
	workspace/AngryBots/src/com/group3/angrybots/RobotProfile.java
	workspace/AngryBots/src/com/group3/angrybots/RobotSettings.java