no message
Merge commit '52ff74189841c9927c6cb1430418b2c5533e7c65'

Conflicts:
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/4.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/402730848.index
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties