update template
renaming
replace synchronization blocks by ReentrantReadWriteLock
cleanup
Merge branch 'feature/redesign' into develop
Merge pull request #118 from shabanovd/develop

I reviewed and tested Dmitriy's proposed changes locally and could not find any unexpected side effects. Concurrency issues are hard to test, so a small risk remains. The previous synchronized effectively locked the entire db though.