server calculates actual player position
Merge branch 'master' of github.com:Javafant/mindless-slayer

Conflicts:
	app.js
	client/static/js/networking.js