merged DockSymmCircle and ClusterAndDraw versions
merged DockSymmCircle and ClusterAndDraw versions
Merge commit '1540ac76395c5802d293d3c1a97c086d869cac73'

Conflicts:
	.settings/org.eclipse.core.resources.prefs