Merge branch 'master' of https://github.com/cytoscape/ndex-java

Conflicts:
	src/main/java/org/ndexbio/rest/command/GetNetworkByEdgesGetCommand.java
	src/main/java/org/ndexbio/rest/command/GetNetworkByNodesGetCommand.java
	src/main/java/org/ndexbio/rest/command/GetTaskGetCommand.java