Merge branch 'dev_1.0.0' of http://39.97.65.143:81/android/android_street into fry_dev

 Conflicts:
	app/src/main/assets/web/zsmap.js
	app/src/main/res/mipmap-xhdpi/icon_me1.png
	app/src/main/res/mipmap-xhdpi/icon_me2.png
	app/src/main/res/mipmap-xhdpi/icon_me3.png
	app/src/main/res/mipmap-xhdpi/icon_me4.png
	app/src/main/res/mipmap-xhdpi/icon_me5.png
	app/src/main/res/mipmap-xhdpi/icon_me6.png
	app/src/main/res/mipmap-xhdpi/icon_me7.png
	app/src/main/res/mipmap-xhdpi/icon_me8.png

app/src/main/assets/web/zss.js

@@ -56,7 +56,7 @@ google.maps = google.maps || {};
 			],
 			[
 				"zh-CN",
-				"CN",
+				"US",
 				null,
 				0,
 				null,