Merge pull request #29 from ajstanley/7.x

MVD references changed to collation.
Redirect after removing a bookmark back to the work bench
Merge pull request #30 from nigelgbanks/7.x-EMIC-61-Workbench

Redirect after removing a bookmark back to the work bench
Fix consolidated TEI Added forms for uploading TEI etc.
Merge pull request #31 from nigelgbanks/7.x-conslidate-tei

Fix consolidated TEI Added forms for uploading TEI etc.