to merge
Merge branch 'test' of https://github.com/CBriss/Game into test

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Artwork/Materials/desktop.ini.meta
	Assets/Artwork/Textures/Glass/desktop.ini.meta
	Assets/Artwork/Textures/desktop.ini.meta
	Assets/Artwork/Textures/skyBox/desktop.ini.meta
	Assets/Artwork/desktop.ini.meta
	Assets/Materials/desktop.ini.meta
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/1a/1ae97afa1ff35eb4cb58a2c642933810
	Library/metadata/23/233fd46d1186a4b5287e67548abc25be
	Library/metadata/26/265c46609d11da9e11009f3944295342
	Library/metadata/3c/3c4ba29bbcc1bc94491325eeec586371
	Library/metadata/3d/3d798ce49668f4bd59e22a6e5f177de8
	Library/metadata/5a/5a204587cd11639e1100366aae9ef342
	Library/metadata/84/84d0b01237aff44b6ba2e5879e8de0aa
	Library/metadata/bb/bb7d205af52840046837eec23f803659
	Library/metadata/c0/c0f12dabc4c26724f9d736c66c261b19
	Library/metadata/d5/d53d5c0a454d940b1aa95f6e7a484ee9
	Library/metadata/e9/e9391d1954d56f8468a9d66900d3a818
	Library/metadata/ea/ea8118a9df0d7524dbb7b3608f8193e0
	Library/metadata/ec/ec87577f9ef204865804883b6385115c
	Library/metadata/fb/fb77e09e6e29be14da77c3ffe3a659cc
	Library/shadercompiler-1.log
fix conflict
bug fixed in EnemyAI, also need to change to MAXDISTANCE in Unity