Merge branch 'master' of...

Merge branch 'master' of https://gitlab.fi.muni.cz/xlestin1/pa165_ice-hockey-manager into scenario-simulation

# Conflicts:
#	match/src/test/java/cz/muni/fi/pa165/controller/MatchControllerIT.java
#	user/src/test/java/cz/muni/fi/pa165/controller/UserControllerTestIT.java