Refactoring of classes and methods to reflect the name change poll.
Merge remote-tracking branch 'origin/sbol2' into sbol2

Conflicts:
	core2/src/main/java/org/sbolstandard/core2/SBOLWriter.java
	core2/src/main/java/org/sbolstandard/core2/test/writeTester.java