update transferring data objects
Merge branch 'master' of https://github.com/ptruong88/NewDungeon

Conflicts:
	src/com/example/longdungeon/BattleActivity.java