added canvas oauth login; test with dev environment
Merge branch 'develop' into feature/canvas-login