Merge remote-tracking branch 'origin/dev' into dev_lishuo

# Conflicts:
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/App.cs

Assets/Mapbox/Examples/Scripts/QuadTreeCameraMovement.cs

@@ -89,7 +89,8 @@
 			float xMove = Input.GetAxis("Horizontal");
 			float zMove = Input.GetAxis("Vertical");
 
-			PanMapUsingKeyBoard(xMove, zMove);
+			//孙涛注释，键盘输入和文本框有冲突
+			//PanMapUsingKeyBoard(xMove, zMove);
 
 
 			//pan mouse