Merge remote-tracking branch 'origin/test'

# Conflicts:
#	src/main/resources/application.properties