paulkim6 jcheng26: Added rewards activity
paulkim6 jcheng26: Added custom array adapter for rewards
paulkim6 jcheng26: fixed small bug with adding rewards
paulkim6 jcheng26: added purchase button to reward activity.
paulkim6 jcheng26: commited layout files
ssong25, hlim10: Created new code with Quest features
Merge branch 'US11-gitfix'
paulkim6, jcheng26: Created merge point
paulkim6 jcheng26: added new activity for creating rewards
merged code hlim10, ssong25

merged code into master branch project
paulkim6 jcheng26: added validation for purchasing
*

*
Merge branch 'master' into US10

Conflicts:
	ToDoRPG/Android/NewToDoRPG/res/layout/activity_main.xml
	ToDoRPG/Android/NewToDoRPG/res/values/strings.xml

ToDoRPG/Android/NewToDoRPG/src/com/cs429/todorpg/revised/MainActivity.ja
va
Merge branch 'US10'
paulkim6, jcheng26: Add sprites
paulkim6 jcheng26: updating look of adding reward. Refactored how to add
a new reward
paulkim6 jcheng26: Finished adding new rewards
paulkim6 jcheng26: deleted unused files
paulkim6 jcheng26: add inventory files
paulkim6 jcheng26: Added Expandable List