Merge branch 'master' of https://github.com/v-eliseev/RoomPlanner