Fixing merge conflicts.
More experimenting
Fixing merge conflict.
fix issue with dragging annotations not working
Merge branch 'master' into document_transaction

Conflicts:
	documents/partials/annotation.html
move all the issue_type munging to the database, and assume clean(er) data on the frontend
styled the marker-highlight toggle
Merge branch 'document_transaction' of https://github.com/sharewave/frontus into document_transaction
Merge branch 'document_transaction' into testing

Conflicts:
	documents/js/controllers/annotationController.js
	documents/partials/annotation.html