20130722wll
add by wang
Merge branch 'master' of github.com:facingwaller/17go