Merge remote-tracking branch 'upstream/master'
fixed datetimepicker https bug
Warning Cleanup and UsagePoint/show local time zone fix
Merge pull request #57 from jateeter/master

fixed datetimepicker https bug
Merge branch 'master' of
https://github.com/energyos/OpenESPI-ThirdParty-java

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