first commit to the branch

Added fix to horizontal extension in the TinyMCE RichText-Annotator.

Also includes trying to add annotator to Studio. Only thing failing
currently is getting TinyMCE to work at all.

Adding fixed to merging conflicts

Added folksonomic tags for annotations and also added the ability for video annotation to work on studio minus tinymce

Adding License to Tags plugin

Changed way that token is retrieved so it does not have to create a new view just to retrieve that item.

Other fixes:
1. Removed calls in base to tinymce found in the annotation tool so as
not to confuse it with the item already existing.
2. Removed references to token and in the url schema and moved the
firebase_token_generator out of the student django apps for the time
being (eventually it should be retrieved from the original project if
applicable)

Added ways for instructors to allow students to use diacritic tags in their text annotations

Added quick fix to diacritic annotator to work properly based on whether instructor added items or not

Removed reference to tinymce in OVA

removed instances of courseid as token handling has changed.

fixed duplicated code issue for token retriever. It's now its own file