STEP4 of RESTful support (ROOT/XPath & atom+xml)
CORSFilter adjustment
Recovery from strange merge of Don's last pull request
Back to Consistency
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
changed CORSFilter.java back to datacustodian.web.filter package
actually put the CORSFilter.java file in...
web.xml (CORSFilter - one last time:)
minor formating cleanup
Merge pull request #42 from jateeter/master

Step4 of RESTful Implementation