change hibernate sets
Merge branch 'nn'
merge nn