Make sure common NR resource slug does not conflict with test specific NP resource slug
Merge pull request #203 from jamesrdf/test.png

Make sure common NR resource slug does not conflict with test specific
Accept both 200 AND 204 response to OPTIONS request
Merge pull request #204 from jamesrdf/no-content

Accept both 200 AND 204 response to OPTIONS request
Address issue #205 to add last unimplemented DC test.

Also fixed problem with not properly skipping tests when run from Eclipse when marked as coveredByTest
Change to WG-NOTE from unofficial draft status
Fixes #207
Fixed confusing name for test in IC
Allow ldp#constrainedBy Links to use data: URIs
Merge pull request #210 from cbeer/constrainedByData

Allow ldp#constrainedBy Links to use data: URIs
Correct constrainedBy URI parsing
Merge pull request #211 from cbeer/constrainedByUris

Correct constrainedBy URI parsing.

May affect some testing and test results, haven't assessed but right fix
Retrieve the property the ldp:insertedContentRelation is pointing to and add it to the default model used. See 5.5.1.2.
Merge pull request #212 from MiguelAraCo/master

Retrieve the property the ldp:insertedContentRelation is pointing to and add it to the default model used
Added testContainerHasInsertedContentRelation.
Merge branch 'upstream' into testContainsLdpcUri

Conflicts:
	src/main/java/org/w3/ldp/testsuite/test/IndirectContainerTest.java
Changed METHOD to AUTOMATED
Fix compilation errors under java 8
Clarified PUT tests
Merge pull request #216 from MiguelAraCo/testContainsLdpcUri

Added IndirectContainer test: testContainerHasInsertedContentRelation