20140307 hzy commit
Merge branch 'master' of https://github.com/hzy87email/MyTest