Merge pull request #1 from xiajun868/master

修改
pom.xml 修改

修改了pom.xml依赖
Merge pull request #2 from xiajun868/20130619

pom修改
Merge pull request #3 from xiajunsongfan/20130619

合并
分支提交
Merge branch 'master' into 20130619
测试冲突

测试冲突
xxx
ss
Merge pull request #1 from xiajunsongfan/master

s