Step 3 of Notificaton + imports cleanup in all files
cleanup
NotificationService refactoring + 14 individual test files for
notificaiton work
Cleanup
Merge remote-tracking branch 'upstream/master'
Added RestTemplate Bean to the test-configuration.xml
Merge pull request #62 from jateeter/master

Step 3 of Notification + import cleanups etc.
This may be a duplicate checkin ...
Merge pull request #63 from jateeter/master

This may be a duplicate checkin ...
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