Bugfixing
Bugfixing
Merge branch 'master' of https://github.com/ChubbyLover/GamefulLiving

Conflicts:
	devbuild0.1/Library/CurrentLayout.dwlt
	devbuild0.1/Library/ScriptAssemblies/Assembly-CSharp.dll
	devbuild0.1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	devbuild0.1/Library/assetDatabase3
	devbuild0.1/Library/expandedItems
	devbuild0.1/Library/guidmapper
	devbuild0.1/Library/metadata/30/306c7861d84b2bb4eb2e718084abf4e1
	devbuild0.1/devbuild0.1.userprefs
no message