shock proxy changes included
Merge branch 'master' of https://github.com/jgurtowski/jnomics-manager

Conflicts:
	lib/jnomics-0.4.jar