Subscription/Repository integration (at last:)
Unification of the .jsp substructure (step 1)
Merge pull request #52 from jateeter/master

Subscription/Repository integration (at last:)
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