Merge branch 'master' of...

Merge branch 'master' of https://gitlab.fi.muni.cz/xlestin1/pa165_ice-hockey-manager into after-M2-test-update

# Conflicts:
#	team/src/main/java/cz/muni/fi/pa165/controller/TeamRestController.java