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
Step 3 of Notificaton + imports cleanup in all files
cleanup
NotificationService refactoring + 14 individual test files for
notificaiton work
Cleanup