Sync lightning strike update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cigam-csharp.sln
	Cigam.sln
	Cigam.userprefs
	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/metadata/85/854f4a43e227492438c7760de2f188a0
	Library/metadata/96/9670f7920035d37438244a8262d90aa9