Shock changes and front end changes in RNASEq
Merge branch 'master' of https://github.com/jgurtowski/jnomics-manager

Conflicts:
	conf/jnomics-kbase-server.properties