- Change Copyright notice to 2014
- Add Scope value to access_confirmation screen
- Add "Allow" & "Deny" Buttons to access_confirmation screen
- Default approval to "Deny" on access_confirmation screen
Merge branch 'master' of http://github.com/energyos/OpenESPI-DataCustodian-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-DataCustodian-java
Merge branch 'master' of
http://github.com/energyos/OpenESPI-DataCustodian-java

Conflicts:
	src/main/webapp/WEB-INF/jsp/tiles/footer.jsp
WIP
WIP
Merge branch 'master' of
http://github.com/energyos/OpenESPI-DataCustodian-java

Conflicts:
	src/main/java/org/energyos/espi/datacustodian/web/customer/UsagePointController.java
	src/main/webapp/WEB-INF/jsp/tiles/footer.jsp
WIP
Merge branch 'master' of http://github.com/energyos/OpenESPI-DataCustodian-java
Merge branch 'master' of http://github.com/energyos/OpenESPI-DataCustodian-java
Merge branch 'master' of http://github.com/energyos/OpenESPI-DataCustodian-java
Fix undefined symbol in UsagePoint test
Merge branch 'master' of
http://github.com/energyos/OpenESPI-DataCustodian-java

Conflicts:
	src/main/java/org/energyos/espi/datacustodian/web/api/BatchRESTController.java
Merge branch 'master' of http://github.com/energyos/OpenESPI-DataCustodian-java
WIP
Merge branch 'master' of
http://github.com/energyos/OpenESPI-DataCustodian-java

Conflicts:
	src/main/java/org/energyos/espi/datacustodian/oauth/EspiTokenEnhancer.java
	src/main/java/org/energyos/espi/datacustodian/web/api/BatchRESTController.java
	src/main/java/org/energyos/espi/datacustodian/web/custodian/AdminController.java
	src/main/java/org/energyos/espi/datacustodian/web/custodian/AssociateUsagePointController.java
	src/main/java/org/energyos/espi/datacustodian/web/custodian/UploadController.java
	src/main/java/org/energyos/espi/datacustodian/web/filter/CORSFilter.java
	src/test/java/org/energyos/espi/datacustodian/web/customer/ScopeSelectionControllerTests.java
WIP
Merge branch 'master' of
http://github.com/energyos/OpenESPI-DataCustodian-java

Conflicts:
	src/main/java/org/energyos/espi/datacustodian/oauth/AccessConfirmationController.java
	src/main/java/org/energyos/espi/datacustodian/oauth/EspiTokenEnhancer.java
	src/main/java/org/energyos/espi/datacustodian/oauth/UserApprovalHandler.java
	src/main/java/org/energyos/espi/datacustodian/web/api/BatchRESTController.java
	src/main/java/org/energyos/espi/datacustodian/web/api/RetailCustomerRESTController.java
	src/main/java/org/energyos/espi/datacustodian/web/api/TimeConfigurationRESTController.java
	src/main/java/org/energyos/espi/datacustodian/web/custodian/AssociateUsagePointController.java
	src/main/java/org/energyos/espi/datacustodian/web/custodian/UploadController.java
	src/main/java/org/energyos/espi/datacustodian/web/customer/UsagePointController.java
	src/main/java/org/energyos/espi/datacustodian/web/filter/CORSFilter.java
	src/test/java/org/energyos/espi/datacustodian/web/customer/ScopeSelectionControllerTests.java
WIP