Work on the UI
Merge branch 'master' of
https://Crigges:aaaaaaaaa1@github.com/Crigges/HotN.git

Conflicts:
	HotN/wurst/war3map.j