Merge pull request #53 from hexiaoming/master

更改了log设置文件的位置
polish
Merge remote branch 'upstream/product'

Conflicts:
	.gitignore