fix ControllerButtonSettings
Merge branch 'master' of https://github.com/mrpin/game0

Conflicts:
	.idea/workspace.xml