Merge branches 'develop' and 'master' of git+ssh://github.com/cytoscape/cytoscape-impl into develop