lab04, fixed problem with the JAXB example using generated classes
Merge branch '04' into 05
Merge branch '05' into 06
Merge branch '06' into 07
Merge branch 'master' into solutions