fixed dispatcher
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/js/classes/InputHandler.js