Hula
Merge branch 'vocadict' of https://github.com/sanyam5/dwhack into vocadict

Conflicts:
	vocadict/Library/assetDatabase3
	vocadict/Library/guidmapper