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

Conflicts:
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-vs.unityproj