fixed jquery bug but implemented a new one with Annotator.  TODO: implement work view and annotation view as a singleton.
fixing merge conflicts
adding unstaged changes to be overwritten by latest merge
more unstaged changes
floobits changes
changes to be overwritten
Merge branch 'master' of https://github.com/FinalsClub/AnnotoriousClient-Server
adding the markdown plugin