Merge upstream/master
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
- 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
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
WIP
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java

Conflicts:
	src/main/java/org/energyos/espi/common/utils/ExportFilter.java
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java

Conflicts:
	src/main/java/org/energyos/espi/common/service/ResourceService.java
	src/main/java/org/energyos/espi/common/service/impl/ResourceServiceImpl.java
Correct missing symbol build error
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java

Conflicts:
	src/main/java/org/energyos/espi/common/domain/Subscription.java
	src/main/java/org/energyos/espi/common/service/impl/SubscriptionServiceImpl.java
Add missing import statements
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java

Conflicts:
	src/main/java/org/energyos/espi/common/domain/IntervalBlock.java
	src/main/java/org/energyos/espi/common/service/ImportService.java
	src/main/java/org/energyos/espi/common/service/impl/ImportServiceImpl.java
	src/main/java/org/energyos/espi/common/service/impl/ResourceServiceImpl.java
	src/main/java/org/energyos/espi/common/utils/ATOMContentHandler.java
WIP
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java

Conflicts:
	src/main/java/org/energyos/espi/common/domain/ApplicationInformation.java
	src/main/java/org/energyos/espi/common/domain/Subscription.java
	src/main/java/org/energyos/espi/common/repositories/jpa/BatchListRepositoryImpl.java
	src/main/java/org/energyos/espi/common/repositories/jpa/IntervalBlockRepositoryImpl.java
	src/main/java/org/energyos/espi/common/repositories/jpa/ResourceRepositoryImpl.java
	src/main/java/org/energyos/espi/common/repositories/jpa/RetailCustomerRepositoryImpl.java
	src/main/java/org/energyos/espi/common/repositories/jpa/SubscriptionRepositoryImpl.java
	src/main/java/org/energyos/espi/common/repositories/jpa/TimeConfigurationRepositoryImpl.java
	src/main/java/org/energyos/espi/common/service/BatchListService.java
	src/main/java/org/energyos/espi/common/service/RetailCustomerService.java
	src/main/java/org/energyos/espi/common/service/impl/ImportServiceImpl.java
	src/main/java/org/energyos/espi/common/service/impl/RetailCustomerServiceImpl.java
	src/main/java/org/energyos/espi/common/service/impl/SubscriptionServiceImpl.java
	src/main/java/org/energyos/espi/common/service/impl/UsagePointServiceImpl.java
	src/main/java/org/energyos/espi/common/utils/DateConverter.java
	src/main/java/org/energyos/espi/common/utils/EntryTypeIterator.java
	src/main/java/org/energyos/espi/common/utils/ResourceLinker.java
Correct build errors after merge #72
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java