Improving layout of notification settings page
Watcher functionality
Merge branch 'master' into email-notifications
Add subscribe button to microcosms
Manually fix merge conflict