kwchen3 lchen59 : added unit tests for getting/adding db items
ssong25, hlim10: Created new code with Quest features
Merge branch 'US11-gitfix'
paulkim6, jcheng26: Created merge point
merged code hlim10, ssong25

merged code into master branch project
*

*
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