Item base class, Constants, first draft of RoomLayout
Merge remote-tracking branch 'origin/master'
Revert "Item base class, Constants, first draft of RoomLayout"

This reverts commit 3e8cbcb0151c5194edc0acefde37127ad174be6e.