Corrections after the demo session.
Merge remote-tracking branch 'origin/master'
JPA example.