delete commited
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log

	.metadata/.plugins/org.eclipse.core.resources/.history/7c/3047c4ca5b490014198e8fbdfcc57c65

	.metadata/.plugins/org.eclipse.core.resources/.projects/activitydemo/.indexes/a0/d6/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/activitydemo/.indexes/a0/de/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/activitydemo/.indexes/e4/81/96/3c/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/activitydemo/.indexes/e4/81/96/72/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/activitydemo/.indexes/e4/81/96/db/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/activitydemo/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/activitydemo/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/activitydemo/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.core/243357375.index
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml