Help: added help modal, accessed by shortcut '?', the help modal only contains a list of all shortcuts right now but will be extended in the future, #952
Merge remote-tracking branch 'upstream/master'