Organization, and city/terrain conflict resolved

Organized all level 1 objects in the scene outliner. Working in
Andresmap should be much easier to do for tech team friday. cleaned up a
terrain bleed through conflict in the city area. the landscape there
should now be more flat, and not bleed into the newly expanded city.