Fix merge error with Published Layout in Designer
Fix merge error with Published Layout in Designer

xibosignage/xibo-cms,dasgarner/xibo-cms,alexharrington/xibo-cms,xibosignage/xibo-cms,alexharrington/xibo-cms,dasgarner/xibo-cms,dasgarner/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,alexharrington/xibo-cms,xibosignage/xibo-cms,xibosignage/xibo-cms,alexharrington/xibo-cms,dasgarner/xibo-cms,alexharrington/xibo-cms