i006_z005
i006_z005
Merge branch 'i006_z005' into i006

Conflicts:
	BH2430_/build/classes/BattleWindow/Window$1.class
	BH2430_/build/classes/BattleWindow/Window.class
	BH2430_/build/classes/mapdisplayer/GUIPanel$1.class
	BH2430_/build/classes/mapdisplayer/GUIPanel.class
	BH2430_/build/classes/mapdisplayer/Player.class
	BH2430_/src/mapdisplayer/Player.java