Merge branch 'jr/feature-db-indices' into 'releases/v2-3'

Changed table indices to be compatible with hibernate

Indices are now compatible to the new hibernate version. Thanks, @rueckert

See merge request !15