trialing fix for include article id and order in generated ocr json.
Merge remote-tracking branch 'origin/master' into ocr-aid
added subclasses of IngestOcrUtils to fix and test the inclusion of articles in ocr json.
Merge branch 'master' into ocr-aid

* master:
  Fixed join.
  Changed join column in SQL statement
  upgrade to 1.1.70
  Fixed up tests
  Changed the Upload Stats Report Label. Fixed ReportsTest by ensuring that no Aquitted Jobs are in the H2 database before each test starts.
  Added new report. Made the Reports view and controller DRY. Amalgamated Reports and ReportTests into a single file each.
  Bump amber version
  Updated test and report to handle Date for digitstatusdate
  Added silly gears icon to button and reindented
  rm a few compiler warnings
  Catalogue Report. Include tests. Add UI. Add menu.
  Adding A reports UI for catalogue
  Ignore tests
  Unit test for prev commit
  don't open files to find width for thumbnails
  First cut of generating the report for the Cataloguers. Includes tests.
  Updated the installation instructions.

Conflicts:
	pom.xml
adding mets Id to sections
Update IngestOcrUtils.java
actually initialise metsDoc
Merge branch 'master' into ocr-aid
Merge remote-tracking branch 'origin/master' into ocr-aid

* origin/master:
  Fix calendar CSS issue
  Really really really use utf8
  Add Maven Version and Env into layoutHeader.ftl
  First attempt to insert version number
  added jquery picker to check screen
  Sweet jquery date picker
  Expiry Date
  handwriting
  restrictionType and expiryDate back end on Identify screen
  Add restrictionType and expiryDate fields
  Make access conditions "unrestricted" by default
  compiler warning ;)
tidying up for pull request
job record throws different exceptions

Rather than just catching everything and raising a runtime exception.
Name the handler properly

Method was named the wrong thing
Use Tika to check filetype when extracting metadata

Allows us to issue a sensible error message.
proper equals() method

my bad...
Add filename to TIFF MD IOExceptions

Add the file name to the messages you get when there's a TIFF metadata exception
Collapse stacktraces

They are annoying
Change to use enum. Also return a work even if it has not been committed yet.
Add print for stylesheet output options.
Change show to display metadata from work. But inly display link to item once job status is Acquitted or inDocworks.
Merge branch 'master' into ti_printjob