Revert ""

This reverts commit 534ed01aa79d0ef3f9ce8c88d75e391a4baacec5.
Merge origin/master
Merge origin/master
Affectation chambre