Merge branch 'master' into develop

# Conflicts:
#	src/main/java/com/diagbot/facade/IndicationFacade.java
#	src/main/java/com/diagbot/util/CoreUtil.java
#	src/main/java/com/diagbot/util/ParamUtil.java
#	src/main/resources/application-pro.yml