Merge pull request #7 from prashantchhabra89/feature/powercalcs

Modified calculations to accomodate database's data's format
Test commit. Updates to web app api jar files.
Added some jQuery functions. 
UI refactoring
Map now will be size of the window. Scroll bar now will not show up on
full screen.
Merge pull request #8 from prashantchhabra89/jQueryFunctions

Added some jQuery functions.
Merge branch 'master' into heatmapper

Conflicts:
	PowerPlanner/war/index.html
Added heatmap proof of concept with interaction.
Merge pull request #11 from prashantchhabra89/heatmapper

Heatmapper
change h5 margin
add all files to repo
i don't what happened... i need to stage again
added 3 picture. also, i'm pushing this to "retina" branch just to test.
Test change for retina branch
Removes Redundant folder
Merge pull request #12 from prashantchhabra89/retina

Retina
Datastore populator script.
Merge pull request #13 from prashantchhabra89/feature/databasepopulator

Feature/databasepopulator
Merge branch 'feature/powercalcs' of https://github.com/prashantchhabra89/Alternate-Power-Source-Property-Mapper.git into feature/powercalcs
Resolved merge conflict in Datastore Populator (Solar)