Some highly necessary performance improvements
Some bugs with shallow locks fixed that were found during automated tests
Merge branch 'master' of github.com:sara-nl/BeeHub