Merge pull request #3 from HettyIsIn/master

Merge pull request #1 from madre/master
1.5， 1.6， 1.7粗译完稿，待修整
Merge pull request #2 from madre/master

sync一下下你的