seemed to be pending, so committed and pushed - though I didn't change
the file.
start of Step 6

Merge remote-tracking branch 'upstream/master'
RESTful step 6 Start
Modified Authorization.java to include dataCustodianId,
thirdPartyApplicationName in the xml
Modified Authorization.java to remove the dataCustodianId, clientId
constraint.
Added *findById and *findByUUID to services/repository/domain for
ApplicationInformation, Authorization, and Subscription objects
Merging back into Step 6
Merge remote-tracking branch 'upstream/master'
Added run_tests.sh back in (not sure how it got removed. ..)
Added removes for @ManyToMany and @ManyToOne relationships so em.remove
can happen in EPQualitySummary, EPUsageSummary, MeterReading,
Subscription and UsagePoint
Merge handling + unlinking upon delete
Merge pull request #24 from jateeter/master

Step 6.1 of RESTful Implementatoin
Merge branch 'master' of https://github.com/energyos/OpenESPI-Common-java