Changes to tests to make sure the tests are passing with our customization
Merge branch 'develop' of https://github.com/m-narayan/canvas-lms into develop
remove some rubymine generated json files