- fix bug 12345 http://lauxanh.us
Merge branch 'master' of https://github.com/han2100/unity

Conflicts:
	Game Jam 2/Assembly-CSharp-Editor-firstpass-vs.csproj
	Game Jam 2/Assembly-CSharp-Editor-firstpass.csproj
	Game Jam 2/Assembly-CSharp-Editor-firstpass.pidb
	Game Jam 2/Assembly-CSharp-Editor-vs.csproj
	Game Jam 2/Assembly-CSharp-Editor.csproj
	Game Jam 2/Assembly-CSharp-Editor.pidb
	Game Jam 2/Assembly-CSharp-firstpass-vs.csproj
	Game Jam 2/Assembly-CSharp-firstpass.csproj
	Game Jam 2/Assembly-CSharp-firstpass.pidb
	Game Jam 2/Assembly-CSharp-vs.csproj
	Game Jam 2/Assembly-CSharp.csproj
	Game Jam 2/Assembly-CSharp.pidb
	Game Jam 2/Assembly-UnityScript-Editor-firstpass-vs.unityproj
	Game Jam 2/Assembly-UnityScript-Editor-firstpass.pidb
	Game Jam 2/Assembly-UnityScript-Editor-firstpass.unityproj
	Game Jam 2/Assembly-UnityScript-firstpass-vs.unityproj
	Game Jam 2/Assembly-UnityScript-firstpass.pidb
	Game Jam 2/Assembly-UnityScript-firstpass.unityproj
	Game Jam 2/Assembly-UnityScript-vs.unityproj
	Game Jam 2/Assembly-UnityScript.pidb
	Game Jam 2/Assembly-UnityScript.unityproj
	Game Jam 2/Assets/New Terrain 2.asset
	Game Jam 2/Assets/Standard Assets/Water (Pro Only)/Water4/Sources/Materials/Water4Example.mat
	Game Jam 2/Library/InspectorExpandedItems.asset
	Game Jam 2/Library/assetDatabase3
	Game Jam 2/Library/expandedItems
	Game Jam 2/Library/guidmapper
	Game Jam 2/Library/previews/4e/4e1467e748fa74c64b96759b3d9713ae
	Game Jam 2/Library/previews/ae/ae162c0523ab4468bb03ef160eb672e2
	Game Jam 2/ProjectSettings/QualitySettings.asset
	Game Jam 3/Assembly-CSharp-Editor-firstpass.pidb
	Game Jam 3/Assembly-CSharp-Editor.pidb
	Game Jam 3/Assembly-CSharp-firstpass.pidb
	Game Jam 3/Assembly-CSharp.pidb
	Game Jam 3/Assembly-UnityScript-Editor-firstpass.pidb
	Game Jam 3/Assembly-UnityScript-firstpass.pidb
	Game Jam 3/Assembly-UnityScript.pidb
	Game Jam 3/Assets/Game Jam 2.unity
	Game Jam 3/Assets/Materials/03 - Default.mat
	Game Jam 3/Assets/tankShooter.cs
	Game Jam 3/Game Jam 3-csharp.sln
	Game Jam 3/Game Jam 3.sln
	Game Jam 3/Game Jam 3.userprefs
	Game Jam 3/Library/AssetServerCacheV3
	Game Jam 3/Library/InspectorExpandedItems.asset
	Game Jam 3/Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll
	Game Jam 3/Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll.mdb
	Game Jam 3/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Game Jam 3/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Game Jam 3/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Game Jam 3/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Game Jam 3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Game Jam 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Game Jam 3/Library/ScriptAssemblies/Assembly-UnityScript-Editor-firstpass.dll
	Game Jam 3/Library/ScriptAssemblies/Assembly-UnityScript-Editor-firstpass.dll.mdb
	Game Jam 3/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Game Jam 3/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Game Jam 3/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Game Jam 3/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Game Jam 3/Library/ScriptMapper
	Game Jam 3/Library/assetDatabase3
	Game Jam 3/Library/cache/15/1523062706c199c47aa92e5b79025035
	Game Jam 3/Library/cache/4c/4cf1cdbaf9ceda64490476f8d2607f3b
	Game Jam 3/Library/cache/5f/5f4706249779cfa438f9b606cb9e507e
	Game Jam 3/Library/expandedItems
	Game Jam 3/Library/guidmapper
	Game Jam 3/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Game Jam 3/Library/metadata/5f/5f4706249779cfa438f9b606cb9e507e
	Game Jam 3/Library/metadata/d3/d3cff03129c9e2940a6aca67bdccd153
	Game Jam 3/Library/previews/04/043dd225084e8c244adfb88c9f14702d
	Game Jam 3/Library/previews/17/17d17d58beff25347882eb94613e4fcb
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/100000
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/100004
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/100008
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/100010
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/4300000
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/4300002
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/4300004
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/4300006
	Game Jam 3/Library/previews/45/4532fad064a9fbb4c89531ad56293155_/4300008
	Game Jam 3/Library/previews/4d/4d2d9aee6c15f9144a499a079a6697ad
	Game Jam 3/Library/previews/55/558769fc5fa71ae4697f4f521aa851fe
	Game Jam 3/Library/previews/5b/5b5c5575fd4c74abd9f7b30862fb76a3
	Game Jam 3/Library/previews/5f/5f4706249779cfa438f9b606cb9e507e
	Game Jam 3/Library/previews/61/616774c26eeff6d4799a74d49215f9da
	Game Jam 3/Library/previews/70/708c77a7d9b2f874f85a3e87d017837f
	Game Jam 3/Library/previews/84/848918a99d11f25f110026ca44295342
	Game Jam 3/Library/previews/9b/9b5ea6df3438286498d8d59c6a42f56f
	Game Jam 3/Library/previews/ae/ae162c0523ab4468bb03ef160eb672e2
	Game Jam 3/Library/previews/b9/b9b0a5294095a6344b2f4e4228965ab6
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/100000
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/100002
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/100006
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/100008
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/4300000
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/4300002
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/4300004
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/4300006
	Game Jam 3/Library/previews/c4/c44f813e90b9a21468650715368919d5_/4300008
	Game Jam 3/Library/previews/cb/cbcdf494494f148aeb89607e07297737_/2800000
	Game Jam 3/Library/previews/d3/d3cff03129c9e2940a6aca67bdccd153
	Game Jam 3/Library/previews/f3/f3e32124a4f2f3f4cb68a1c16bca1ac2