Added edit menu back in

This reverts commit 3ec757bb4863149d1d351bde820cb53411d9170d.
Removed 'trigger' from GBA and SNES controller prefs
Merge remote-tracking branch 'upstream/master'