[fixes #23] New footer style
Establishment types added.
Add expiration value of 5m to the session.
[fixes #91] Pressing return works
Merge remote-tracking branch 'origin/develop' into feature/23-footer

Conflicts:
	eatsmart/static/css/site.css
	eatsmart/templates/base.html
[refs #23] reverts change to padding
Merge pull request #102 from tamcap/feature/95-add-session-timeout

[fixes #95] Add expiration value of 5m to the session Merged! :+1:
Merge pull request #103 from codefordurham/feature/91-search-return

[fixes #91] Pressing return works
Merge pull request #78 from codefordurham/feature/23-footer

[fixes #23] New footer style
Changes to APIs to fit the new models
Makes API work. Now we use our internal IDs vs. external IDs in the API.
fix footer alignment on desktop (GitHub link); fix nav alignment
Merge pull request #100 from tamcap/types

[fixes #93] Establishment types added
s/est_type/type/
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 remote-tracking branch 'origin/develop' into feature/72-template-translations

Conflicts:
	eatsmart/templates/base.html
	inspections/models.py
[fixes #73] Adds spanish translation