Joystick
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/main_joystick.js
Joystick merged