KeybindingUtils done
KeybindingUtils implemented in OptionsPanel
Fix merge conflict
Merge branch 'master' of https://github.com/Kuxe/oopprojekt