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

Conflicts:
	Assembly-CSharp-Editor-vs.csproj