Updated base uri after discussion yesterday.
Made resource URIs property agnostic
Merge remote-tracking branch 'upstream/master'

 enter a commit message to explain why this merge is necessary,
Merge pull request #92 from ft2000/master

Base uri change after our discussion