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

Conflicts:
	codex.txt
	workspace/.metadata/.log
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/11/0230e66966a800121d8ec4fe66808e74
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/11/d4e052cd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/14/5071371e6db0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/15/5058c24164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/15/c05098c542b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/16/516accd600ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/19/d06f50cd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/19/d2e052cd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1b/e028c64164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/20/206f969f73b0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/21/e02b7dffa9ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/25/216f969f73b0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/25/d0e052cd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/25/d26f50cd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/26/509ed0faaaac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/26/e39ccb066cb0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/29/40528097baac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/29/50c7e63cfbad001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/2d/d46f50cd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/30/e046c14164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/31/d36f50cd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/32/10698fa643b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/32/c03212df45b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/35/50b2b34164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/37/60f0c44164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/37/f077f0e545b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/3a/d5e052cd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/3c/004015df45b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/3e/d1fe4dcd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/3e/e0781070f5b0001211e5dc95ee74af2a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/43/a0c616df45b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/44/80ec546766af00121e5afb3d305a2554
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/44/b0afde066cb0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/45/10d817df45b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/48/e10dce066cb0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/49/10451beefaad001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/4c/3092700baeac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/4c/601e4e3b4ab000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/4d/4001fbde45b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/50/10681c4a64b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/51/b020e1066cb0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/52/8017ffe845b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/52/f0dd941166af00121e5afb3d305a2554
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/54/c0f5cc6eaaac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/55/d0ca9781abac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/56/004f21b8cdac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/56/60c345d74db000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/57/304fe674a8ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/58/50d77081aaac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/5b/f07db708b4ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/5c/5063e95d43b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/60/03bfe36966a800121d8ec4fe66808e74
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/62/2032fec4a9ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/62/60b913df45b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/64/b05eef9fbcac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/64/b0a751ffacac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/65/10b9989f73b0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/65/800771f7c9ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/65/f0e9f348bcac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/66/f0c7b24164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/69/101645d6f9ad001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/69/b078a5d4adac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/6e/f0e88619f9ad001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/6f/0430e66966a800121d8ec4fe66808e74
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/73/e0ef8fadacac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/74/e09de22e72b0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/77/f0ffbcee42b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/79/11b9989f73b0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/7c/10bcc14164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/7d/9072d56ba8ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/85/10f0c631b7ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/86/20aeb54164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/87/b0b3c54164b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/8d/f09b178ab4ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/8e/8045925c48b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/9/e4b44bcd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/95/80e0a216b4ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/9a/40e69083acac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/9b/1062944b64b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a/0330e66966a800121d8ec4fe66808e74
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a2/00c01a64bcac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a4/209695b0a9ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a7/0630e66966a800121d8ec4fe66808e74
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ab/e2b44bcd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ae/a0ebcae948b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b7/20fe939f73b0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ba/c0666cc8bdac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/bf/e005bc5564b00012130ef8538f0a4e47
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/bf/f0f60b56bcac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c1/40ae35a61db100121ffcbb691b55795d
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c3/d0353364f5b0001211e5dc95ee74af2a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c5/704e44546eb0001210ea976390290411
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/cc/e02c203d66af00121e5afb3d305a2554
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/d3/004d3935f5b0001211e5dc95ee74af2a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/db/d2fe4dcd00ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e3/00b70dc2abac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e3/6067c1c94ab000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/eb/703dfa0b44b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f1/c039fcde45b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f2/90d3516bbcac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f4/3075f7a54bb000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f5/e0a3a4d000ae001219fcc7ced8538c3a
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f7/80f2a71342b000121dc7e61a7759b99c
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f8/02a1e86966a800121d8ec4fe66808e74
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/fa/20ea1cada9ac00121d9ed58d3dc54c7b
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/a0/62/properties.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/a0/82/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/a0/d6/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/a0/d6/properties.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/a0/de/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/a0/de/properties.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/e4/7e/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/e4/81/6c/53/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/e4/d1/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/e4/e4/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/e4/fc/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.indexes/properties.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/.markers
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/AngryBots/org.eclipse.jdt.core/state.dat
	workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs
	workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/New_configuration.launch
	workspace/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace/.metadata/.plugins/org.eclipse.jdt.core/1088059325.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	workspace/.metadata/.plugins/org.eclipse.jdt.debug.ui/dialog_settings.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	workspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/AngryBots/2013/4/17/refactorings.history
	workspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/AngryBots/2013/4/17/refactorings.index
	workspace/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	workspace/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	workspace/AngryBots/bin/AngryBots.apk
	workspace/AngryBots/bin/classes.dex
	workspace/AngryBots/bin/classes/DB/AndroidDB.class
	workspace/AngryBots/bin/classes/DB/BCrypt.class
	workspace/AngryBots/bin/classes/Messaging/Client.class
	workspace/AngryBots/bin/classes/Messaging/LeaderBoardMessage.class
	workspace/AngryBots/bin/classes/Messaging/LoginMessage.class
	workspace/AngryBots/bin/classes/Messaging/Message.class
	workspace/AngryBots/bin/classes/Messaging/Request.class
	workspace/AngryBots/bin/classes/Messaging/Update.class
	workspace/AngryBots/bin/classes/adapters/CodexReader.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/Achievement.class
	workspace/AngryBots/bin/classes/base/Member.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/Achievements.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/AngryBotsProfile.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/HumanWiki.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/Leaderboard$1.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/Leaderboard.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/LoginActivity$1.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/MiniGame$1.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame$2.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame$3.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame$4.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame$5.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame$MyGestureListener.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame.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/MiniGame3$RPC$Gesture.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame3$RPC$Result.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame3$RPC.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MiniGame3.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/MinigamePortal.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$raw.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/classes/com/group3/angrybots/RobotWiki.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/Settings.class
	workspace/AngryBots/bin/classes/com/group3/angrybots/SuperMiniGames.class
	workspace/AngryBots/bin/resources.ap_
	workspace/AngryBots/gen/com/group3/angrybots/R.java
	workspace/AngryBots/res/drawable/robot_mgbuttons.xml
	workspace/AngryBots/res/layout/activity_mini_game3.xml
	workspace/AngryBots/res/raw/codex.txt
	workspace/AngryBots/src/Messaging/AchievementMessage.java
	workspace/AngryBots/src/adapters/NetworkAdapter.java
	workspace/AngryBots/src/adapters/PersistentSettings.java
	workspace/AngryBots/src/base/Achievement.java
	workspace/AngryBots/src/com/group3/angrybots/AngryBotsProfile.java
	workspace/AngryBots/src/com/group3/angrybots/LoginActivity.java
	workspace/AngryBots/src/com/group3/angrybots/MiniGame3.java
	workspace/AngryBots/src/com/group3/angrybots/SuperMiniGames.java