java generic description added to fixture
Merge remote-tracking branch 'origin/master'
end date now is nullable
admin changed to support state