Merge branch 'milestone-3' into 'feature/seeder'

# Conflicts:
#   core/src/main/java/cz/muni/fi/pa165/core/DataInitializer.java
#   core/src/main/java/cz/muni/fi/pa165/core/user/roles/Role.java