Add advanced collision experiment
Merge branch 'lab/advanced-animation' into feature/jump-interpolation

Conflicts:
	src/client/lib/client.js
	src/server/socket-server.js