Merge branch 'master' of /home/pavel/IdeaProjects/BGU-REIT with conflicts.
update