fixes #2227 Distinguished between File->Import->Network... and File->Import->Ontology and Annotation... so that method that breaks Ontology and Annotation is not called.
Merge branch 'develop' of github.com:cytoscape/cytoscape-impl into develop