Bugfix: disallow merging with locked layers

Fixes issue #135
Disable layer controls when user is locked

Fixes issue #136