update registry and lock implementation
Merge branch 'master' of http://github.com/DemandCube/Scribengin into dev/kingofpoptart