Updated CSS.
Merge branch 'master' of https://github.com/SCPR/firetracker

Conflicts:
	calfire_tracker/static/css/display.css
Merge branch 'design_template'
Starting to patch IE8. Introduced 1x-sized rasters.
Merge branch 'design_template'
Merge branch 'master' of github.com:SCPR/firetracker