整理test项目
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/src/main/java/com/vernon/test/DianZiQuanMD5Builder.java
整理test项目