Discussions developments
Merge remote-tracking branch 'origin/refactor' into r2

Conflicts:
	sefaria/model/note.py