fixing conference description persist/update
Merge branch 'conference-description' into replace-hibernate