i006_z008
i006 kosmetyka
yo
Merge branch 'i006_z008' into i006

Conflicts:
	BH2430_/build/classes/BattleWindow/BattleWindowPanel.class
	BH2430_/build/classes/BattleWindow/Window$1.class
	BH2430_/build/classes/BattleWindow/Window$2.class
	BH2430_/build/classes/BattleWindow/Window.class
	BH2430_/build/classes/mapdisplayer/ArmyBattleStage.class
	BH2430_/build/classes/mapdisplayer/ArmyBattleWindow$1.class
	BH2430_/build/classes/mapdisplayer/ArmyBattleWindow$2.class
	BH2430_/build/classes/mapdisplayer/ArmyStats.class
	BH2430_/build/classes/mapdisplayer/CardPanel$1.class
	BH2430_/build/classes/mapdisplayer/CardPanel.class
	BH2430_/build/classes/mapdisplayer/GUIPanel$1.class
	BH2430_/build/classes/mapdisplayer/GUIPanel.class
	BH2430_/build/classes/mapdisplayer/GameFrame$1.class
	BH2430_/build/classes/mapdisplayer/GameFrame.class
	BH2430_/build/classes/mapdisplayer/MapPanel.class
	BH2430_/build/classes/mapdisplayer/Product.class
	BH2430_/build/classes/mapdisplayer/Sector.class
	BH2430_/build/classes/waitingroom/WaitingRoomPanel.class
	BH2430_/nbproject/private/private.properties
	BH2430_/src/BattleWindow/Window.java
	BH2430_/src/mapdisplayer/ArmyBattleStage.java
	BH2430_/src/mapdisplayer/ArmyBattleWindow.java
	BH2430_/src/mapdisplayer/ArmyStats.java
	BH2430_/src/mapdisplayer/GUIPanel.java
	BH2430_/src/mapdisplayer/GameFrame.java
	BH2430_/src/mapdisplayer/MapPanel.java
	BH2430_/src/mapdisplayer/Sector.java
	BH2430_/src/waitingroom/WaitingRoomPanel.java