Merge branch 'zs_branch' into 'master'

...-42.ThemePark.Model.Construction.Test/ConstructionTest.cs

CSIP-42.ThemePark.Model.Construction.Test/UtilityTests.cs

CSIP-42.ThemePark.Model/Entity/Games/CarouselGame.cs

...-42.ThemePark.Model/Entity/Restaurants/SushiRestaurant.cs

CSIP-42.ThemePark.Model/Enumerators.cs

CSIP-42.ThemePark.Model/Model.cs

...rk.Persistance/Resources/EntityConfigForConstruction.json

...Resources/EntityConfigForConstruction_NotAllEntities.json

....Persistance/Resources/EntityConfigForSimulationTest.json

....Persistance/Resources/PlaceableEntityConfigurations.json

CSIP-42.ThemePark.View/CSIP-42.ThemePark.View.csproj

CSIP-42.ThemePark.View/Images/BadCarouselGame.png

CSIP-42.ThemePark.View/Images/BadSushiRestaurant.png

CSIP-42.ThemePark.View/Images/BrokenCarouselGame.png

CSIP-42.ThemePark.View/Images/BuildingCarouselGame.png

CSIP-42.ThemePark.View/Images/BuildingSushiRestaurant.png

CSIP-42.ThemePark.View/Images/GoodCarouselGame.png

...2.ThemePark.View/Images/GoodNoElectricityCarouselGame.png

CSIP-42.ThemePark.View/Images/GoodSushiRestaurant.png

CSIP-42.ThemePark.View/Images/NoElectricityCarouselGame.png