temp
Merge branch 'master' of https://github.com/yamin-elmakis/IronDome2

Conflicts:
	IronDome2/log/WarLogger.xml
	IronDome2/src/TzukEitan/dal/WarDB.java
	IronDome2/src/TzukEitan/listeners/IGetWarStatistics.java
	IronDome2/src/TzukEitan/view/ConsoleView.java
	IronDome2/src/TzukEitan/view/TzukEitan.java
	IronDome2/src/TzukEitan/view/swing/ControlPanel.java
	IronDome2/src/TzukEitan/view/swing/view/TzukEitanFrame.java
	IronDome2/src/TzukEitan/war/WarControl.java