refactoring timepad user synchronization
refactoring unicorn config
Merge branch 'develop' into staging