Changed classses to match the updated UML diagrams.
Merge branch 'sbol2' of https://github.com/SynBioDex/libSBOLj into sbol2

Conflicts:
	core2/src/main/java/org/sbolstandard/core2/AccessType.java