Joystick: Weapon selection toolbar implemented
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/joystick/Controller.js
Joystick: Weapon selection toolbar implemented