Varied tree tilesets, minor changes/fixes
Merge branch 'impact' of https://github.com/tufts-LASER/Trails-Forward-server into impact

Conflicts:
	public/lib/game/main.js