fix gamepad button configuration
Merge branch 'master' of github.com:voxelinc/voxellancer into fix_gamepadbutton_configuration

Conflicts:
	data/config.ini
	src/ui/inputconfigurator.h
fix merge
Merge pull request #514 from voxelinc/fix_gamepadbutton_configuration

fix gamepad button configuration