Merge branch 'master' into US15
jcheng26 ssong55: added new images for enemy attack
lchen59 paulkim6 : small changes

Add more functionality to battle system
lchen59 paulkim6 : basic multiplayer battle system
hlim10 kchen26 : Modified Daily Alarm Activity
hlim10 kchen26: Toast Added
lchen59 paulkim6 : small bug fixes in battle
Merge branch 'master' into US15

Conflicts:

ToDoRPG/Android/NewToDoRPG/src/com/cs429/todorpg/revised/model/ToDoChara
cter.java
Merge branch 'US15'
hlim10 kchen26 : customized Toast
hlim10 kchen26 : Dynamically change the name when user edit name
lchen59 paulkim6 changed DailiesDB
Merge remote-tracking branch 'origin/US13' into US15
Merge branch 'US15' of https://github.com/kevinwchen26/ToDoRPG into US15
hlim10 kchen: changed sqlite, and count completed todo and daily
Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG into US15
lchen59 paulki6 small fixed
hlim10 kchen26: ToDo Event Log added
hlim10 kchen26: Daily Event log added
kwchen3 hlim10: updating stats and log after battle