Fixed caching and updating after saving a Scope
Merge branch 'master' of github.com:rmosolgo/adt
Merged in new changes