edx/edx-platform — pull request #4028 by lduarte1991 (2014-06-09 16:12:56+00:00)
Title: Annotation Tools: Plan B

Worked with @singingwolfboy to create this Plan B for the annotation tool. All commits have been checked previously.