Fixed unit tests.
Merge branch 'origin/develop'

Conflicts:
	src/test/java/org/ndexbio/rest/CreateTestDatabase.java
	src/test/java/org/ndexbio/rest/NetworkFromExcelTest.java
	src/test/java/org/ndexbio/rest/NetworkQueryTest.java
	src/test/java/org/ndexbio/rest/services/TestGroupService.java
	src/test/java/org/ndexbio/rest/services/TestNdexService.java
	src/test/java/org/ndexbio/rest/services/TestNetworkService.java
	src/test/java/org/ndexbio/rest/services/TestTaskService.java