commit before branch cleanup.
Fixed merge conflicts.
Backing up tile assembly code.
Merge branch 'master' into tile_assembly