Merge branch 'master' of...

Merge branch 'master' of https://gitlab.fi.muni.cz/xlestin1/pa165_ice-hockey-manager into team-unpotato-mission

# Conflicts:
#	team/src/main/java/cz/muni/fi/pa165/service/TeamServiceImpl.java
#	team/src/main/resources/application.yml