add setting to ignore list
Merge branch 'master' into DevBranch

Conflicts:
	.settings/org.eclipse.wst.common.component