link move, add collide checking, can't finish game yet.
Merge branch 'feature/dev-yuyu-official' into develop

Conflicts:
	public/js/game.client.js
collide instead of die log