Feature/room combination change in progress lockout#1447

equinoy wants to merge 38 commits into

mainPepperDash/Essentials:mainfrom

feature/room-combination-change-in-progress-lockoutPepperDash/Essentials:feature/room-combination-change-in-progress-lockoutCopy head branch name to clipboard