[fixes #72] Marks template strings for translation.
Establishment types added.
Merge branch 'develop' into feature/72-template-translations
[refs #72] Mark model fields for translation
fix footer alignment on desktop (GitHub link); fix nav alignment
Merge pull request #100 from tamcap/types

[fixes #93] Establishment types added
basic leaflet map
Merge pull request #99 from tamcap/develop

Changes to APIs to fit the new models
Merge pull request #105 from codefordurham/feature/footer-alignment

Footer alignment
Merge branch 'develop' into map
start of a map
Merge remote-tracking branch 'origin/develop' into feature/72-template-translations

Conflicts:
	eatsmart/templates/base.html
	inspections/models.py
[fixes #73] Adds spanish translation
[refs #72] Changes the location where the flags appear
added basic zooming after adding points to the map.
fixed zooming to occur on map ready event.
changed map styling.
[refs #72] fixes translations not showing in the admin
[fixes #72] Fixes per codereview
Two small html and css fixes.