jcheng26: added db to reward activity
Merge pull request #2 from kevinwchen26/US13

jcheng26: added db to reward activity
lchen59 paulkim6 finished updating the new weapons classes. Need a new DB/helper and tests
lchen59 paulkim6 forgot getters/setters/equals for Equipment.java
lchen59 paulkim6 deleted ToDoCharacter.java from utils to avoid confusion
lchen59 paulkim6 deleted some unnessesary code from last iteration
lchen59 paulkim6 changed Constants.java
lchen59 paulkim6 InventoryDB done, needs the other 4 equips
lchen59 paulkim6 InventoryActivityTest is broken
lchen59 paulkim6 rechecked habits/character/rewardsDB
lchen59 paulkim6 added Secondary Weapon DB
merging master with US14
hlim10 kchen26 : Error fixed
hlim10 kchen26 : Modify errors + add Battle Activity
ssong25 jcheng26: battle activity back in application.
Merge pull request #4 from kevinwchen26/US13

ssong25 jcheng26: battle activity back in application.
replaced stock icons with character icon w/o items