Added citation support
Merge branch 'codemirror-integration' into mygollum