Updates to clean up network filters and menu ordering
Merge branch 'master' of https://github.com/RBVI/clusterMaker2

Conflicts:
	src/main/java/edu/ucsf/rbvi/clusterMaker2/internal/ui/NewNetworkView.java