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

Conflicts:
	src/Library/assetDatabase3
	src/Library/guidmapper
i've brought the bees
Merge branch 'master' of https://github.com/pattra/honeymancer

Conflicts:
	src/Library/ScriptAssemblies/Assembly-CSharp.dll
	src/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	src/Library/assetDatabase3
	src/Library/guidmapper
	src/Temp/__EditModeScene