inputconfigurator cleanup
enum InputClass to switch between primary and secondary input
Fix crash when configuring joystick
Merge branch 'master' of https://github.com/voxelinc/voxellancer into inputconfigurator_cleanup

Conflicts:
	src/gamestate/gameplay/running/gameplayrunninginput.cpp
	src/ui/inputconfigurator.cpp
	src/ui/inputconfigurator.h
Merge pull request #432 from voxelinc/inputconfigurator_cleanup

inputconfigurator cleanup