Merge remote-tracking branch 'origin/master'

# Conflicts:
#	power-fitting-JN/src/main/resources/application.yaml