Add ObjectWatcher
Fix
Merge branch 'master' of https://github.com/an2323/calendar