Added map properties via XML.
Conflicts resolved.
Merge branch 'master' of https://github.com/pyrosphere3/cubewars.git

Conflicts:
	cubewars/src/com/cubewars/GameController.java