dec25
Merge branch 'master' of https://github.com/obean/diypc

Conflicts:
	diypc/.classpath
	diypc/WebRoot/js/insert.js
	diypc/WebRoot/pages/peizhi.jsp
	diypc/src/com/beanboss/controller/Want.java
	diypc/src/com/beanboss/dao/imp/DaoImp.java
	diypc/src/com/beanboss/service/impl/FindPeizhiImpl.java
	diypc/src/com/beanboss/test/Test.java