controller buttons started, OpenVGDB error catching
Merge branch 'master' of github.com:ColinKinloch/Emulatron

Conflicts:
	src/control-pref-panel.cc