Merge branch 'dev' into dev-station-activity

# Conflicts:
#	admin/src/main/resources/application-dev.yml
#	miniapp/src/main/resources/application-dev.yml