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
Limit the rate of logins.
fix more rebase conflicts
adjusting fix for studio drop-down nav in IE9
Merge pull request #554 from edx/diana/django-ratelimit

Limit the rate of logins
Merge pull request #562 from edx/fix/frances/studio-ie-menu-bug2

adjusting fix for studio drop-down nav in IE9
redirects edge landing page to /dashboard
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
Add TabsEditingDescriptor for VideoAlpha

Updates comment
Make Model descriptor class property.
Fix tests
Fixes
Fixed typo of function call. Added comment why it is necessary.
Merge pull request #571 from edx/valera/one_speed_html5_fix

Fixed typo of function call. Added comment why it is necessary.