Course id clash command
Allow 'course' as course's id keyword
Skipping new test until Jenkins mongo updated to >= 2.2
Added wait for problem to re-render when checking or resetting it
Added wait for JS on upload page
Fixed an issue where css_click wasn't waiting for JS to load
Merge pull request #1484 from edx/dhm/course_id_clash

Course id clash command
Merge pull request #1568 from edx/will/acceptance-test-fixes

Will/acceptance test fixes
Remove dates from status messages

* clean up one last typo

LMS-1387
Studio: revises the styling for the export view to sync with the import view's UI
Merge pull request #1553 from edx/gprice/forum-follow-a11y

Improve accessibility of forum follow buttons
Merge pull request #1561 from cpennington/hotfix-assertion-error

Fix AssertionErrors that were raised when creation of an XModule failed
Merge pull request #1570 from edx/gprice/forum-staff-label

Remove label from forum posts by global staff
Merge pull request #1546 from edx/christina/export

Make export URL restful.
Studio: changes URL for password reset to direct to LMS login view
STUD-689
Merge pull request #1572 from edx/talbs/fix-studio-forgotpassword

Studio: Fix - Forgot Password Modal
updated course creation UI: placeholder text for Org is now more generic, run is now using current format, and tips are now below fields to allow more room for tip text
Addresses bugs STUD-885 and STUD-916
Merge pull request #1566 from edx/frances/fix/studio-course-creation-org-placeholder

Course creation form cleanup
User menu a11y changes to allow use of spacebar, escape key and arrow keys or tab and shift+tab to navigate
add comment explaining child_history condition
Merge pull request #1563 from edx/jbau/OEE/feedback-handle-nonexistent-child

add error handling for update_score for OEE when no child_history
Fix bugs in Video player. BLD-468.