Merge branch 'master' into develop
add google visualization support, add SPA
Checkin before pull from origin.
Merged Yongwen's additions to my reorg.
Saving work after lockup.
Passing Unit tests with reorg.
Cleaned up Checkstyle errors.
Changed client properties defaults to match server defaults.
Removed extra import.
fix main class in Procfile
Merge branch 'develop' of https://github.com/wattdepot/wattdepot into develop
Broke out the Put HTTP calls from the rest.

They have a different URL than the other three operations.
Fixed Imports for Checkstyle.
Bumped version to 3.0.0-M5
we should get rid of this file
Merge branch 'release-3.0.0-M5'
Procfile