Add the ability to lock assets.

Test for locking of assets.

Merge conflict.