resolve merge conflicts
add escaping
one more escaping
add some unit tests for the new fields
be sure to encode the display strings
fix rebase conflicts
fix more rebase conflicts
touch-ups per review feedback
fix formatting error
wrong accessor
Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum

add display_coursenumber and display_organization fields on the CourseModule