zhangjf 2014-11-04头部文件文字修改
Merge remote-tracking branch 'origin/master'