Merge branch 'milestone-3-fe-zelnik' of...

Merge branch 'milestone-3-fe-zelnik' of https://gitlab.fi.muni.cz/xzelnik/music-band-manager into milestone-3-fe-zelnik

# Conflicts:
#	mbm-rest/src/main/java/cz/fi/muni/pa165/DataLoader.java