site porting
Merge branch 'jpa-working' of github.com:jcstaff/ejava-javaee into jpa-working