Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java