some changes
asd
Merge branch 'master' of https://github.com/Ibtikar/HexaProject

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	HexaProject.userprefs
	Library/EditorUserBuildSettings.asset
	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/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/003c1e8c89e954fc7bed44f51a2e5f6e
	Library/metadata/04/045c6991a673d46e899f3af4bc9277c9
	Library/metadata/05/0532c5917b32a4c868067ac25005c385
	Library/metadata/05/05cfca651774d408fbddfd18bac96a3f
	Library/metadata/15/159a933da99864ea6a71b3c49f817a6c
	Library/metadata/23/23ea466e6ccce4d29893156e26083840
	Library/metadata/48/4843c38edbd314a0eaa79434e6c9bc38
	Library/metadata/69/6985bee3467cc4c7d8317e915c8390e9
	Library/metadata/85/8523732c4374c4133bf043de2bc373a9
	Library/metadata/86/860aaabe539cb414d99f93054cd2e64c
	Library/metadata/86/8673f29e615f64f059aa333333b17232
	Library/metadata/89/89983015980fd4787ba00296d7111aa7
	Library/metadata/94/94f2cef0ade8c4579a147a10f6b42050
	Library/metadata/97/97cc979089ecf4b4d8bac771dbd2ec21
	Library/metadata/c2/c26b334cc988d41e6b9b3069244e6e56
	Library/metadata/c5/c5490fcdfb83642f489628c768069b6c
	Library/metadata/d6/d669a0c200a7d43778c151c5d4b86d58
	Library/metadata/d9/d9eec0c4daddf46f8bf66d9475e5d0ce
	Library/metadata/e0/e0059d3ae7e0d4abab1ceffaba62be69
	Library/metadata/e0/e02411217f1dd4e3591bc6db989e2ec5
	Library/metadata/e7/e703557d46c1a479e9c4db57fe19cd57
	Library/metadata/fd/fdbd63baaaed447c7bf293feeae81426
asd