Revert 33e8810..ca4d102

This rolls back to commit 33e88101c50c0b51e7ab529d13ce4c769f29ab99.
Revert "Revert b9e4d35..fea65de"

This reverts commit ca4d102eb749bad670457031aaf91cff60b8d4d9, reversing
changes made to fea65de91f6729886dc4d455ea47bc09f625948a.
Merge branch 'dev' of https://github.com/CIRDLES/topsoil into dev

Conflicts:
	src/main/java/org/cirdles/topsoil/chart/concordia/ConcordiaChart.java

src/main/java/org/cirdles/topsoil/chart/concordia/ErrorChartToolBar.java