20140820
Merge branch 'master' of https://github.com/xingkong0325/spring3.x