Merge remote branch 'origin/in3d' into in3d

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/prefabs/mapChipPlayer.prefab
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/29/29db47431e337453e8f146389c21d87f
	Library/metadata/2c/2ccc2bcb8daf5db43815f3949fa31cb1
	Library/metadata/33/3349218250b0d4b8e8d2ea2e6f1ba3a6
	Library/metadata/40/40561d893adf64bfa9d2b4c61dc4429a
	Library/metadata/55/55519a0f9bdf24ebeacafa0f7c190e14
	bomb_unity-csharp.sln
	bomb_unity.sln