S000: Adding new tiles

Change-Id: I9e271d96858be644f5c9dbe08efc9c42dbb493bf
S000: Adding cistern

Change-Id: I5c27069e3d647e5b9062ccc000d5d4c03f146303
Merge pull request #26 from autowitch/dev

Dev