wwjscommit2014/12/7/18/02
Merge branch 'master' of https://github.com/WeijiaWang654321/testRepo