merge with Ricardo's reverted version. Removed a few deprecated classes.
Merge branch '1.0-snapshot' of https://github.com/cytoscape/ndex-common.git into 1.0-snapshot