Merge pull request #152 from iain-benson/upstream

Add desmume version string to the about box
localizations of desmume version
Fix crash if controller is already connected on ROM load
Merge pull request #156 from maicki/master

Fix crash if controller is already connected on ROM load
Update to use base localisation