Merge remote-tracking branch 'origin/Dao_entity_base' into Classes_init

# Conflicts:
#	src/main/java/cz/fi/muni/pa165/entity/BaseEntity.java
#	src/main/java/cz/fi/muni/pa165/entity/PersonEntity.java
#	src/main/java/cz/fi/muni/pa165/entity/TeamEntity.java
#	src/main/java/cz/fi/muni/pa165/entity/TeamManagerEntity.java
#	src/main/java/cz/fi/muni/pa165/entity/TournamentEntity.java
#	src/main/java/cz/fi/muni/pa165/entity/TournamentManagerEntity.java