Merge feature/studydefinitionservice branch with master branch

- Use GL study definition service instead of resource manager
- Update code to use new version of GL catalog service (WIP)