rami du huan
Merge branch 'master' of https://github.com/Crigges/MMC5

Conflicts:
	wurst/war3map.j
happy merge
Merge branch 'master' of https://github.com/Crigges/MMC5