synch
I started unity again
Merge branch 'master' of https://github.com/Helgemonster/CritterSpin

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/25/2585ec5e96706694ea01753f941c9a6d
	Library/metadata/d3/d398064deffa94d05a443fdac71477d7
Merge branch 'master' of https://github.com/Helgemonster/CritterSpin

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper