Added accounts to make 14 for apps for energy and net0 house
Merge remote-tracking branch 'upstream/master'
Merge pull request #39 from MartyBurns/master

Added accounts to make 14 for apps for energy and net0 house
Adjusted URI patterns; made <link> respond to new patterns;  and fixed
ExportFilter Bugs
Clean up updating of authorization and subscription structures during
OAuth processing
Merge branch 'master' of https://github.com/dfcoffin/OpenESPI-Common-java into dfcoffin-master

Conflicts:
	src/main/java/org/energyos/espi/common/service/impl/SubscriptionServiceImpl.java
Merge pull request #41 from energyos/dfcoffin-master

Dfcoffin master
removed merge tags
Changed "BLock" -> "Block"
@Ignored two failing tests
Made IntervalBlocks a Lazy relation
Made MeterReadings and Subscriptions Lazy
Added retailCustomerID to scope management
Fixes to OauthFlow subscriptionURI -> resourceURI
Fixed Batch/Subscription + Batch/Bulk uri generation.
Turned LAZY back on for three of the collections
@Ignore broken tests