Merge branch 'master' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher

# Conflicts:
#	gradle.properties
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

modules/mogo-module-map/README.md

@@ -0,0 +1,8 @@
+# 地图模块
+
+## 地图 Fragment
+
+## 地图状态和小智交互部分
+
+## 语音控制地图
+

modules/mogo-module-map/consumer-rules.pro

@@ -0,0 +1,2 @@
+#-----ModuleMap-----
+-keep class com.mogo.module.map.NavConstants

modules/mogo-module-map/proguard-rules.pro

@@ -19,3 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----ModuleMap-----
+-keep class com.mogo.module.map.NavConstants