update template
renaming
replace synchronization blocks by ReentrantReadWriteLock
cleanup
Merge branch 'feature/redesign' into develop