Merge branch '1-initial' into 2-jpa-classpathscan
Merge branch '2-jpa-classpathscan' into 3-jpa-custom-classpathscan