Merge branch 'master' into develop

# Conflicts:
#	Dockerfile

Dockerfile

@@ -7,4 +7,5 @@ RUN mkdir /root/duiba-deploy/
 ADD ./duiba-deploy /root/duiba-deploy/
 ADD ./scripts /root/scripts
 #define entry point which will be run first when the container starts up
+
 ENTRYPOINT java $JAVA_OPS -jar /root/duiba-deploy/$appname.jar --spring.profiles.active=$SPRING_ENV --spring.cloud.config.uri=$CONFIG_SERVER
\ No newline at end of file