Switched 'subject' to be 'string' type.
Reversing that change, as it should be done on a branch.
Merge branch 'master' of github.com:ukwa/warc-discovery
Merge branch 'master' of github.com:ukwa/warc-discovery
Modified pdf creator/producer to generator mapping.
Merge branch 'master' of github.com:ukwa/warc-discovery

Conflicts:
	warc-hadoop-recordreaders/src/main/java/uk/bl/wa/hadoop/WritableArchiveRecord.java