locking should be after team/task checking
Merge branch 'dev' of github.com:pculture/unisubs into dev