d
Merge branch 'master' of https://github.com/btpka3/btpka3.github.com.git

Conflicts:
	java/spring/jdo/first-spring-jdo/.classpath
	java/spring/jdo/first-spring-jdo/.project
	java/spring/jdo/first-spring-jdo/.settings/org.eclipse.core.resources.prefs
d