removed CANVAS_SERVER_BASE_URL from settings
Merge branch 'feature/eric_test' into develop