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

Conflicts:
	java/spring/first-spring-ws/README
完善自定义dojo widget
自定义dojo widget
d
d
Merge branch 'master' of https://github.com/btpka3/btpka3.github.com

Conflicts:
	java/spring/first-spring-ws/src/main/webapp/WEB-INF/wsdl/MyMath.wsdl
	js/dojo/my/dijit/PersonWidget.js
	js/dojo/my/dijit/PersonWidgetDemo.html
	js/dojo/my/dijit/PersonWidgetDemo.js
	js/dojo/my/dijit/templates/PersonWidget.html
d