Fresh folder copy from Dropbox to merge with Live's code changes and any other code changes.

This is a merge for unbuilt base markers and sellable base.