Adding in stream functionality
Merge branch 'feature/streamcaching' of https://github.com/prashantchhabra89/Alternate-Power-Source-Property-Mapper.git into feature/streamcaching
Merging in changes
Merge branch 'feature/streamcaching' into heatmapper
Added new hydro stream json files, with precalculated weighted average
power potentials
Updated caching, querying, and rendering to support new hydro format.
Hydro data displays properly and interpolates between points based on
zoom level
Fixed right click hydro info for updated data format
Fixed hydro files from error created in binning scripts
Merge remote-tracking branch 'origin/master' into heatmapper
Fixed right click menu bug where hydro data would only load if currently
active.
Added legend; made fixes to right click hydro show data. Changed kWh to
kWh/yr estimate. Changed some default power calcs for wind (decreased
size of turbine blade) and hydro (decreased incline)
Layered folder hierarchy to prevent more than 1000 files being in any
one folder (app engine will reject a deploy not following this rule)
Improve data consistency when using high zoom at low screen resolutions.
Responsiveness from legend.
Merge pull request #76 from prashantchhabra89/heatmapper

Streams and legend
Merge remote-tracking branch 'origin/master' into jQueryFunctions

Conflicts:
	PowerPlanner/war/Scripts/Data/wind_data.js
	PowerPlanner/war/Scripts/marker_helper.js