use jdk 1.6 because of "bad version number" exception when using JPA
Merge branch 'master' into chapter9
Merge branch 'chapter9' into chapter10

Conflicts:
	.classpath
remove duplicated classpath