test
Merge branch 'master' of https://github.com/Ibtikar/HexaProject

Conflicts:
	HexaProject.userprefs
	Library/InspectorExpandedItems.asset
	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/25b7f5c9cabdc438fa3c4b8642f4f30b
	Library/metadata/40/40d4555ab84284f42b82ef8d8fe7eddd