Merge branch 'master' into US15
lchen59 paulkim6 : small changes

Add more functionality to battle system
lchen59 paulkim6 : basic multiplayer battle system
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'