Add collision event.
Collision fix ups.
Merge branch 'master' into demo

Conflicts:
	app/src/client.coffee