world collision

added hero world collision
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/js/game/hero.js