Merging U3 and master branches.
Merge branch 'master' of https://github.com/ivailo-pashov/MunicipalityInfrastructureService