merge 5415065edc6dcef32e63b1340ce313d754dda511

merge from boksee with the added trees, cactus, etc.