Merge branch 'master' of...

Merge branch 'master' of https://gitlab.fi.muni.cz/xlestin1/pa165_ice-hockey-manager into after_M1_changes#2

# Conflicts:
#	core/src/main/java/cz/muni/fi/pa165/core/models/match/MatchActionDto.java