Clean up test.

Conflicts:
	components/tools/OmeroJava/test/integration/ImporterTest.java
Check that all shapes types are imported.
Merge pull request #602 from jburel/roi-test-develop

Roi test develop