add rootscope logout watcher
check
Merge branch 'origin/feature-attachments'