Merge branch 'master' of github.com:badgerman/alh

Conflicts:
	hexfilterdlg.cpp
more wxString fixes
Merge branch 'master' of github.com:badgerman/alh