test
Merge branch 'master' of github.com:gxa/atlas
some mocks for autocomplete
Merge remote-tracking branch 'origin/master'