Merge branch 'dev' into pay_master

# Conflicts:
#	kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml