fix conflict merge.
Merge branch '1.0-snapshot' of https://github.com/cytoscape/ndex-java-client.git into 1.0-snapshot