refactor subscription
Merge branch 'develop' of https://github.com/m-narayan/canvas-lms into develop