忽略setting
Merge branch 'dev' of github.com:ourTimes/ttd into dev

Conflicts:
	.gitignore
	.settings/org.eclipse.wst.common.component
调整忽略文件