Merge branch 'master' of https://github.com/Andy-Shao/Java7Demo.git