Revert "Merge branch '蒋祥林‘分支'－14-8-6-祥林上传"

This reverts commit f82862d30e8eabdb44100885b2cc25092d86fbac, reversing
changes made to 690d53b8757725c78d3b0331eb9d06b842240fc6.
Revert "Revert "Merge branch '蒋祥林‘分支'－14-8-6-祥林上传""

This reverts commit a468d3e1f00acbbe00e57c104487ac2f7e754ee1.
Revert "Revert "Revert "Merge branch '蒋祥林‘分支'－14-8-6-祥林上传"""

This reverts commit 4f38a64a34a40b098e4ce301972757d84adaa82a.
Revert "Revert "Revert "Revert "Merge branch '蒋祥林‘分支'－14-8-6-祥林上传""""

This reverts commit 85df9116c5ef350a3c901a77d4b4b25c813ba153.
Revert "Revert "Revert "Revert "Revert "Merge branch '蒋祥林‘分支'－14-8-6-祥林上传"""""

This reverts commit 415760ad8cc75d428362c31557bb5ec65b746e56.
master_test3