Merge branch 'master' into touch_carousel
Better windows and doors. More text
Merge branch 'touch_carousel'