Merge remote-tracking branch 'origin/milestone1' into UUID_keys_fix

# Conflicts:
#	src/main/java/cz/muni/fi/pa165/fleamarket/entity/Reservation.java
#	src/main/java/cz/muni/fi/pa165/fleamarket/entity/Spot.java
#	src/main/java/cz/muni/fi/pa165/fleamarket/entity/User.java
#	src/main/java/cz/muni/fi/pa165/fleamarket/enums/SpotCategory.java
#	src/test/java/cz/muni/fi/pa165/fleamarket/dao/LocationDaoTest.java