lchen59 paulkim6: added shop activity.

- Create new shop activity
- change action bar so that reward/shop are grouped together
lchen59 paulkim6: shop activity basic implementation
lchen59 paulkim6: shop item info dialog added
lchen59 paulkim6 created DB table, need the CRUD functions
lchen59 paulkim6 finished CRUD, needs tests
lchen59 paulkim6 finished tests, needs an actual library
lchen59 paulkim6 added cost to DB and made some relevant changes
lchen59 paulkim6 finished Library
lchen59 paulkim small changes
Merge branch 'US15'

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

ToDoRPG/Android/NewToDoRPG/src/com/cs429/todorpg/revised/BaseActivity.ja
va

ToDoRPG/Android/NewToDoRPG/src/com/cs429/todorpg/revised/MainActivity.ja
va

ToDoRPG/Android/NewToDoRPG/src/com/cs429/todorpg/revised/ShopActivity.ja
va

ToDoRPG/Android/NewToDoRPG/src/com/cs429/todorpg/revised/utils/Constants
.java

ToDoRPG/Android/NewToDoRPG/src/com/cs429/todorpg/revised/utils/SQLiteHel
per.java
Merge branch 'master' into US15
hlim10 kchen26 : Refactoring
ssong25, jchen26: BT code

BT feature added
jcheng26 ssong55: fix minor bug with navigating out of
battleMainActivity
Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG
Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG into US15
Merge branch 'US15' of https://github.com/kevinwchen26/ToDoRPG
Create README.md

adding placeholder for final documentation
 fixed mainactivity merge problems
jcheng26 ssong55: fix battle start up bug