fixes for new SnowSimulator
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/data/ObjectPool.java