fixes event id generation
some more fixes
Merge of master into postgres branch
Merge branch 'master' into PostgresMerge
Merge branch 'master' into PostgresMerge
Updated unit tests up to 99% coverage
Merge branch 'master' into PostgresMerge
Merge pull request #54 from ministryofjustice/PostgresMerge

Postgres merge