增加忽略文件
Merge branch 'lichun' into LongPolling