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

Conflicts:
	calfire_tracker/static/css/display.css