Take away terrain
Take away building one
Take away building one
Merge branch 'precommit' into jwang
Add building one and terrain back