added @MapsId
Merge branch 'working' of github.com:jcstaff/ejava-javaee into working
adding updated relations slides with @MapsId