Played around with solar scaler. Updated colour scheme.
Merge branch 'master' into heatmapper
Removed deprecated files for old spreadsheets. Added calculations.js to
index.html.
Removed reference to old servlet in web.xml
Hydro queries implemented; basic stream data added in.
Disable point test.
Merge branch 'master' into heatmapper
Added user prompts and help to app page
Merge branch 'jQueryFunctions' into heatmapper
Working commit for demo with some small fixes and minor responsiveness
added
Introduced preliminary functionality of hydro power
Info window only displays semi-fake data! If real data exists, it will
grab that instead.
Update README.md
Merge branch 'jQueryFunctions' into heatmapper

Conflicts:
	PowerPlanner/war/index.html
Merge pull request #67 from prashantchhabra89/heatmapper

Milestone 2 Demo Version
Merge remote-tracking branch 'origin/master' into jQueryFunctions

Conflicts:
	PowerPlanner/war/index.html