jcheng26 ssong55: moved battle stuff to its own menu
Merge pull request #7 from kevinwchen26/US13

jcheng26 ssong55: moved battle stuff to its own menu
kwchen3 hlim10: fixed inventory system and begin migrating status to main page
kwchen3 hlim10: added event log and player stats
kwchen3 hlim10: fixed mainactivity
hlim10 kchen26 : Modified Daily Alarm Activity
hlim10 kchen26: Toast Added
Merge branch 'master' into US15

Conflicts:

ToDoRPG/Android/NewToDoRPG/src/com/cs429/todorpg/revised/model/ToDoChara
cter.java