Merge branch 'dev' into oauth-integration

# Conflicts:
#	README.md
#	winery/docker-compose.yml
#	winery/harvest-management/pom.xml
#	winery/harvest-management/src/main/resources/application.properties
#	winery/sell-wine/src/main/resources/application.properties
#	winery/store-wine/pom.xml
#	winery/store-wine/src/main/resources/application.properties
#	winery/user-management/src/main/resources/application.properties
#	winery/wine-production/pom.xml
#	winery/wine-production/src/main/resources/application.properties