Merge branch 'milestone-3' into 'DeviceAndCompanyControllerTests'

# Conflicts:
#   core/src/test/java/cz/muni/fi/pa165/core/company/CompanyRepositoryTest.java
#   core/src/test/java/cz/muni/fi/pa165/core/device/DeviceRepositoryTest.java
#   core/src/test/java/cz/muni/fi/pa165/core/house/HouseRepositoryTest.java
#   core/src/test/java/cz/muni/fi/pa165/core/metrics/MetricsRepositoryTest.java
#   core/src/test/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterRepositoryTest.java
#   core/src/test/java/cz/muni/fi/pa165/core/user/UserRepositoryTest.java