Merge pull request #37 from jateeter/master

Step4 of RESTful Implementation
Move CORSFilter.java to OpenESPI-Common-java
Remove OriginFilter.java
Remove OriginFilterTests.java
Modified web.xml to find CORSFilter in OpenESPI-Common-java
Correct Travis-CI error due to not using forked OpenESPI-Common-java
file
modified sql profiles to match new Authorization and ApplicationInfo
corrected and moved version of test_usage_data.xml
moved test file to test/fixtures directory
Merge pull request #39 from MartyBurns/master

modified sql profiles and usage data sample
Merge branch 'master' of https://github.com/energyos/OpenESPI-DataCustodian-java
corrected links from localhost:8080 to services.greenbuttondata.org
Merge pull request #40 from MartyBurns/master

corrected links from localhost:8080 to services.greenbuttondata.org
Merge branch 'master' of https://github.com/energyos/OpenESPI-DataCustodian-java
Changed DataCustodian and ThirdParty Screen name to indicate if it is a Development (localhost - dev) or GreenButtonData (GreenButtonData) screen
Add "Content-Type: application/atom+xml" header to responses for GET REST request
Merge pull request #38 from dfcoffin/master

Move CORSFilter.java to OpenESPI-Common-java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/org/energyos/espi/datacustodian/web/api/UsagePointRESTController.java
	src/main/webapp/WEB-INF/web.xml
	src/test/java/org/energyos/espi/datacustodian/web/filter/CORSFilterTests.java
	src/test/resources/fixtures/test_usage_data.xml
	src/test/resources/fixtures/usage_point.xml
back to consistent fork