#0.3 hibernate
#0.4 hibernate db_auto_update
Merge remote-tracking branch 'origin/master'