Merge branch 'dev' into dev_custom_map

# Conflicts:
#	libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java

libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java

@@ -12,7 +12,7 @@ public interface IMogoMarkerClickListener {
      * 事件是否继续往下传递
      *
      * @param marker
-     * @return true - 时间已经处理完毕不继续往下传，否则继续往下传
+     * @return true - 事件已经处理完毕不继续往下传，否则继续往下传
      */
     boolean onMarkerClicked( IMogoMarker marker );
 }