Added drafts for speed_change_video and seek_video event types
Changed scrollbar to playback bar per Carlos
Added change log for the Data Formats part of the guide
Add unit test for updating forum comment
Add label information to problem types
Add new screen shots
Merge pull request #2624 from edx/gprice/test-edit-forum-comment

Add unit test for updating forum comment
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

Due to issues with require.js and the latest version of the toolbar.
Also included a note in the requirements file explaining the situation, and what
needs to happen before this can be upgrade properly.
Disable another video test that failed intermittently in master
Merge pull request #2643 from edx/will/disable-more-video

Disable another video test that failed intermittently in master
Add label information to Appendix E
Merge pull request #2640 from edx/db/rollback-djdt-again

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
Clarified historical effect of the speed_change_video event type
Merge pull request #2644 from edx/sylvia/documentation/BLD-842

Sylvia/documentation/bld 842
Merge pull request #2647 from edx/ahodges-documentation-Sprint16

Ahodges documentation sprint16
Update information about rescoring submissions
Very minor tweaks.
Quick edits
Merge pull request #2648 from edx/sylvia/documentation/BLD-577

Update information about rescoring submissions
i18n open_ended_rubric (ORA-314)

update strings