Test commit. Updates to web app api jar files.
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.