Add the ability to lock assets.

Test for locking of assets.

Merge conflict.
Add class to the tr for locked.
Hook up locking/unlocking to contentstore.
Get locking correct for new files.
Incorporate Frances' UX changes.
Merge with master.