删除
Merge branch 'master' of git@github.com:wangkang80/llsfw.git

Conflicts:
	llsfw-generator/.settings/org.eclipse.wst.common.component