cleanup daily contributions chart
-change back css references to chart to match haml div names
-adjust margins to not clip y axis labels
-abbreviate month names in x axis
-remove hardcoded candidate names
-change color mapping to match charts.js
Merge branch 'master' of https://github.com/openoakland/opendisclosure
comment back in dailyContributionsChartView
Merge branch 'master' of https://github.com/openoakland/opendisclosure into upstream

Conflicts:
	assets/js/app.js
change divs to sections in daily contributions css, comment back in daily contributions chart
Merge branch 'master' of https://github.com/openoakland/opendisclosure into upstream
Added Oakland to header
Merge remote-tracking branch 'ian/master'

* ian/master:
  change divs to sections in daily contributions css, comment back in daily contributions chart
  comment back in dailyContributionsChartView
  cleanup daily contributions chart -change back css references to chart to match haml div names -adjust margins to not clip y axis labels -abbreviate month names in x axis -remove hardcoded candidate names -change color mapping to match charts.js
Clean up zip code chart styles
Merge pull request #211 from elinaru/thumbnail-photos

Added Oakland to header
Merge pull request #213 from vbrown608/master

Clean up zip code chart styles
candidate bio revised wording
updating profile photos to use jpgs
update ethics commission logo for footer
Update zip code chart to use processed summary data from backend.
Comment out Ian's chart for now
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Clean up zip code chart styles
  Added Oakland to header
Merge pull request #218 from vbrown608/master

Update zip code chart to use processed summary data from backend.
Add /api/contributions/over_time for Ian's graph
Employer page scoping #190, fix header on employer agg #191