message
Merge branch 'master' of https://github.com/gaominghui/Test_20140805