edx/edx-platform — pull request #956 by caesar2164 (2013-09-12 18:12:25+00:00)
Title: Implementing NYT's ICE track changes to Open Ended Assessements

- Added boolean to OE problem CMS settings to turn on ICE track changes
- Added ICE init and tracking start/stop to HTML
- Conditional in Peer Grading HTML for ICE container
- CSS styling for ICE container and insertion/deletion elements
- Added class to track changes HTML
- Added ice.min.js as well as included it in the js requirements for peer grading
- Use track_changes in peer_grading_problem
- * Refactor peer_grading_problem to lookup track_changes variable by problem location.
- * Whitelist ICE insert, delete tags
- * Adds ICE multi-user-editor insert and delete tags to the peer grading sanitize_html whitelist.
- add reset button

* = @jrbl

Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
common/lib/xmodule/xmodule/peer_grading_module.py
lms/templates/peer_grading/peer_grading_problem.html