This reverts commit a686e540ee3a012cc7dbec50ac5d3f07fc5f75cd.

working annotation test 

Kill vertical bar left of username.

Fixes #553.

Changed icons, fixed bug, added tooltips and button press effect to controlbar

Unite code for user streams and tag streams.  Fixes #532.

Add support for actually using Gettext in Annotator.

Unit/Functional Tests

Fixes #560.

Also remove now superflous .gray-tags class from CSS.
Fixes #526.

Fixes #555

Fixes #557

Added Controlbar to UI

Add V1 of tagging support

Closes #514 

I wasn't able to follow Randall's suggestions since that broke many things for some reason. I am opening an issue for Control Bar V2, which will include better icons, etc.

We don't have to add annotations to the view if they're replies.

This reverts commit 37134d369fc5c8252edb6d9dd615aa6e66bd1d1c.

From hypothesis/annotator@develop

These are not needed anymore.

Take control over the CSS and simplify the directives.
- Drop jquery.tagit.css. It's easy enough to style ourselves and most
  of it comes from the ui theme anyway.
- Simplify the directive.
  - Don't swap between editor and viewer widgets. Manage the disabled
    state, placeholder, and styling differences ourselves.
  - Stop creating a new scope. This simplifies the model binding by
    avoiding the $parent eyesore used in the annotation. This was
    accomplished by observing the readonly attribute instead of watching
    a scope variable.
  - Use the <ul> form of tagit rather than the input. The need for a
    template is completely removed.
- Allow underscores in tag names.

Fixes #544

- Separate delete handling for the root annotation
- After delete if shows a "This annotation has been deleted!" sign for this annotation.
- Redaction flow is unaffected

- Fixed data.sort function in manage_new_data()
- Reply count for main annotation restored