Merge remote-tracking branch 'canonical/master'
moved stuff around and renamed resources and resource paths
Merge branch 'master' of github.com:USGS-CIDA/coastal-hazards
Merge pull request #398 from jiwalker-usgs/master

Moved around some rest stuff
Conflict resolution after merge from canonical
Fixed an issue with GSON producing scientific notation when converting doubles in a class to JSON