merging - UI
Merge branch 'master' of github.com:BaobabHealthTrust/dde-server
Merge branch 'master' of github.com:BaobabHealthTrust/dde-server
Merge branch 'master' of github.com:BaobabHealthTrust/dde-server
working on sync - managing time