sri oct cufflinks
Merge branch 'master' of github.com:jgurtowski/jnomics-manager into sri_master

Conflicts:
	src/main/java/edu/cshl/schatz/jnomics/manager/server/JnomicsDataHandler.java
updated jnomics