Merge remote-tracking branch 'upstream/master'
corrected test @Autowire problem and masked failing tests
Merge pull request #73 from jateeter/master

corrected test @Autowire problem and masked failing tests
Fixed DataTimePicker htts bug
Merge branch 'master' of http://github.com/energyos/OpenESPI-DataCustodian-java
Warning fixup and fixed UsagePoint/show (timeZone)
Merge pull request #74 from jateeter/master

Warning fixup and fixed UsagePoint/show (timeZone0
Merge branch 'master' of
http://github.com/energyos/OpenESPI-DataCustodian-java

Conflicts:
	src/main/java/org/energyos/espi/datacustodian/web/filter/CORSFilter.java