- Change copyright notice to 2014
- Correctly redirect to "AuthorizationList" screen when user attempts to
request an access token for a Scope that has already obtained an access
token
- Change AuthorizationController to redirect to "AuthorizationList"
screen upon completion removing need to build "AuthorizationList"
Ignore failing JUnit tests
Merge branch 'master' of http://github.com/energyos/OpenESPI-ThirdParty-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-ThirdParty-java
WIP
Merge branch 'master' of
http://github.com/energyos/OpenESPI-ThirdParty-java

Conflicts:
	src/main/webapp/WEB-INF/jsp/tiles/footer.jsp
Restore default logger setting
Merge branch 'master' of http://github.com/energyos/OpenESPI-ThirdParty-java
Merge branch 'master' of
http://github.com/energyos/OpenESPI-ThirdParty-java

Conflicts:
	src/main/resources/spring/greenbuttondata.properties
Merge branch 'master' of http://github.com/energyos/OpenESPI-ThirdParty-java
Merge branch 'master' of
http://github.com/energyos/OpenESPI-ThirdParty-java

Conflicts:
	src/main/java/org/energyos/espi/thirdparty/web/AuthorizationController.java
	src/main/java/org/energyos/espi/thirdparty/web/MeterReadingController.java
	src/main/java/org/energyos/espi/thirdparty/web/UsagePointController.java
Merge branch 'master' of http://github.com/energyos/OpenESPI-ThirdParty-java
WIP
Merge branch 'master' of
https://github.com/energyos/OpenESPI-ThirdParty-java

Conflicts:
	src/main/java/org/energyos/espi/thirdparty/web/NotificationController.java
	src/main/java/org/energyos/espi/thirdparty/web/filter/CORSFilter.java
	src/test/java/org/energyos/espi/thirdparty/web/NotificationControllerTests.java
WIP
Merge branch 'master' of https://github.com/energyos/OpenESPI-ThirdParty-java
WIP
Merge branch 'master' of
https://github.com/energyos/OpenESPI-ThirdParty-java

Conflicts:
	src/main/java/org/energyos/espi/thirdparty/web/AuthorizationController.java
	src/main/java/org/energyos/espi/thirdparty/web/MeterReadingController.java
	src/main/java/org/energyos/espi/thirdparty/web/NotificationController.java
	src/main/java/org/energyos/espi/thirdparty/web/UsagePointController.java
	src/main/java/org/energyos/espi/thirdparty/web/filter/CORSFilter.java
	src/test/java/org/energyos/espi/thirdparty/web/MeterReadingControllerTests.java
	src/test/java/org/energyos/espi/thirdparty/web/NotificationControllerTests.java
	src/test/java/org/energyos/espi/thirdparty/web/UsagePointControllerTests.java
Merge branch 'master' of
https://github.com/energyos/OpenESPI-ThirdParty-java

Conflicts:
	src/test/java/org/energyos/espi/thirdparty/web/MeterReadingControllerTests.java