Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
# README.md
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
# src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
# src/main/resources/application-dev.yml
# web_src/src/components/gb28181/devicePlayer.vue
