Update the namespaces based on bart's feedback
Merge branch 'issue-660-new-annotations' of github.com:MapStory/mapstory into issue-660-new-annotations