Merge branch 'master' of https://github.com/USGS-CIDA/coastal-hazards
Merge branch 'master' of https://github.com/USGS-CIDA/coastal-hazards
Map is now updating the session object. Refactored the session object a bit.
Application is pulling in a canned session (which really does come from the back end) and building the front end based on the session info
Conflict resolution
Updated session management to use what the back-end expects (full items vs just ids, etc)
definition for ranking view
Merge remote-tracking branch 'upstream/master'
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
Merge pull request #399 from isuftin/master

Fix for GSON Double parsing
Merge pull request #400 from bheck/master

"ranking" view added
Added activity resource