remove use of ngettext in discussion jasmine test
Update translations (autogenerated message)
Merge pull request #5156 from edx/sarina/update-aspen-i18n

Sarina/update aspen i18n
CodeMirror should use monospace fonts.

TNL-197
Merge pull request #5160 from edx/ned/cherry-pick-monospace-code-mirror-fonts

CodeMirror should use monospace fonts.
Moved imports to startup.py.
Update platform to use the latest ORA release
Update djpyfs

And move from base.txt to github.txt

Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
update password reset template (TNL-503)
Add SGA to reqs
Revert "Add SGA to reqs"

This reverts commit 35668da16a0906fd3d69951af62ad64d46caf773.
Install analytics repo from a SHA _not_ a tag

The v0.1 tag was mistakenly removed from upstream. While attempting to
restore it, it was restored to point to an earlier, incorrect
SHA/object.

Git does not support "renaming" of tags (changes to existing tags are
ignored), so environments which still had a local, cached copy of the
original tag were unaffected. Fresh installs were broken.

This change pins the version to the original source SHA, instead of a
tag.

Conflicts:
	requirements/edx/github.txt
OAuth signature should be verified against URL provided to the tool.  There is possibility that a proxy will change URL along the way (for example protocol from https to http) which would invalidate signature.  Supporting LTI_1 and LTI_2 use case.

(cherry picked from commit 9a1d8df737ed6f3b82cd84a1f391fb62c7d5724d)
Fixed problems with psychometrics

- Update key comparisons for Opaque Keys
- Search for 'problem_check' instead of 'save_problem_check' when
  filtering TrackingLogs.

(cherry picked from commit efa4400342c9f8391ff309c39561adb3de4116be)
Added handling in gitlog for missing import logs

Fixes a template error that occurs when viewing a course's detailed
git import log. The problem happens for courses imported using methods
other than the `git_add_course` command.

(cherry picked from commit c571a2a029cf902c9f63a122acafb995f1722035)
Add Staff Graded Assessments
Remove unimplemented grade_summary feature.

(cherry picked from commit 5bfa313dcb1c343ee6ff8159166b157b333aaa91)

Conflicts:
	lms/djangoapps/instructor/views/legacy.py
Corrected NameError for invalid variable

(cherry picked from commit 6b95ec8de23f5270c260c623f0b8748b84bbad86)
Move sga to submissions branch