Merge commit '80c7953ad0432e4038a0e7e8db17ce8e2449c11b' into fixmaster

Conflicts:
	src/main/java/demo/DemoOrientBioAssembly.java
	src/main/java/org/biojava3/structure/quaternary/analysis/CalcBioAssemblySymmetry.java
	src/main/java/org/biojava3/structure/quaternary/analysis/OrientBiologicalAssembly.java
	src/main/java/org/biojava3/structure/quaternary/core/ChainClusterer.java
	src/main/java/org/biojava3/structure/quaternary/core/SequenceAlignmentCluster.java
Merge branch 'master' into fixmaster