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

Conflicts:
	src/Library/assetDatabase3
	src/Library/guidmapper
	src/Library/metadata/d6/d6204aa2aeea34b25bf2ae1ff20adbc7
	src/Library/metadata/e5/e59da28bc00b34468ab2ca0987b2dc63
bear prefab