Merge upstream/master
Fixed XPath GET Collection problem
Merge pull request #46 from jateeter/master

Fixed XPath GET Collection problem
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
made localhost8080 version all default http:// uris
Merge pull request #47 from MartyBurns/master

made localhost8080 version all default http:// uris
XPath export completion for resource members and collections inherited
from Identified Object
Mutated export of all references to LocalTimeParameters and ReadingType
to ROOT form.
Normalized the XMLGregorianCalendar used in Marshalling to get the "Z"
format.
Merge pull request #48 from jateeter/master

See Individual Commit Comments (XPath Scoping, "Z" formatting, ROOT versions only for Time/ReadingType
- Upgrade to Spring 3.2.5.RELEASE
- Upgrade to Spring Security 3.2.0.RELEASE
- Upgrade to Spring Security OAuth 2.0.0.M2
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
Added support for:
/Batch/RetailCustomer/{retailCustomerId}/UsagePoint/{usagePointId}
Merge pull request #49 from jateeter/master

Added support for:
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
wrapped the service later (ResourceService.getById()) in a read-only
transaction to insure rollback happens in a contained way. This enables
the migration of all <IdentifiedObject T> getById() to now be refactored
into the implementation.
Merge pull request #50 from jateeter/master

wrapped the service later (ResourceService.getById()) in a read-only
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
Attempted work-around for NoResultException.x.TransactionRollback error
unwind...
Merge pull request #51 from jateeter/master

Attempted work-around for NoResultException.x.TransactionRollback error