Rebasing to Kevin's Copy.
Merged and fixed conflicts

Conflicts:
	b2u-mobileapp/b2u_mobileapp/gen/com/example/b2u_mobileapp/R.java
	b2u-mobileapp/b2u_mobileapp/res/values/strings.xml
	b2u-mobileapp/b2u_mobileapp/src/com/example/b2u_mobileapp/ChallengeAdapter.java
	b2u-mobileapp/b2u_mobileapp/src/com/example/b2u_mobileapp/ChallengeInfoActivity.java
	b2u-mobileapp/b2u_mobileapp/src/com/example/b2u_mobileapp/ChallengeListActivity.java