Final Path tests and minor adjustments
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test/ODataQueryExpandCollectionTest.php
	src/ODataResource.php