Partially fixed cache
Merge branch 'heatmapper' into feature/clientcache

Conflicts:
	PowerPlanner/war/Scripts/map_helper.js
Cache done! I think...
Merge remote-tracking branch 'origin/feature/clientcache' into feature/clientcache
Update the solar scaler
Merge branch 'heatmapper' into feature/clientcache

Conflicts:
	PowerPlanner/src/com/powerplanner/PowerDBServlet.java
	PowerPlanner/war/Scripts/map_helper.js
Extracted out a number of data related functions, cutting out a huge
chunk of redundant code (about 300 lines worth!)
Removing accidental addition of eclipse preferences
--
--
Changed cache to hashmap
Merge pull request #70 from prashantchhabra89/feature/clientcache

Client caching, front end fixes, code modularization
Seasonal data for solar and hydro
Fixed hydro
Merge pull request #71 from prashantchhabra89/feature/seasons

Feature/seasons
Modularized cache. Added table to map_helper explaining location of
moved functions.
Added binned streams. More js code modularization. Fixed right click
display values for wind.
Right click info window now asynchronously gets real data values,
fetching either from what is currently available, what is in cache, or
what it gets from a server query.

Modularized server queries, adding a second type (callback instead of
auto-populate map)