newversion
Merge branch 'working' into develop

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