revertcommit
Merge branch 'master' of github.com:Glidias/Asharena

Conflicts:
	bin/bundle/spawners/arena/IslandGenWorker.swf