-
Merge branch 'master' of
https://pamelarussell@github.com/mgarber/scriptureV2.git

Conflicts:
	src/java/nextgen/core/writers/PairedEndWriter.java
More functionality for Gibson assembly array designer