merge
Merge branch 'master' of https://github.com/pattra/honeymancer

Conflicts:
	src/Library/assetDatabase3
fixed merge thing