Merge remote-tracking branch 'origin/master' into jQueryFunctions
Added Seasonal dropdown menu for users to select a season
Fixed intro degree sign error
Minor UI changes for resource panel
Increase red border width for resources icons for when "Show" is clicked
Merge remote-tracking branch 'origin/jQueryFunctions' into
jQueryFunctions

Conflicts:
	PowerPlanner/war/index.html