Merge pull request #82 from prashantchhabra89/heatmapper

Some updates to everything
Fix issue where legend tour tip flickers
Fixed potential bug where passive queries (for prefetching) would have
stopped before running.
Merge pull request #84 from prashantchhabra89/heatmapper

Fixed potential prefetching bug
Commit for merging
Merge remote-tracking branch 'origin/master' into prefetchcache
Removed endless console logging when (".arrow").attr('style') is
undefined (basically any time other than that one screen of the tour)
All data type selections forced to be same season
Merge branch 'jQueryFunctions' into heatmapper
Annual/seasonal power switching now works in some cases.
first trial
Fixed up a few more things for passive loading.
prefetchcache with bugs...
Merge remote-tracking branch 'origin/heatmapper' into prefetchcache

Conflicts:
	PowerPlanner/war/Scripts/marker_helper.js
	PowerPlanner/war/Scripts/server_query.js