New design proposal
added link to title in map popup. Fixes #115.
[refs map] Uses title case for map popups
Merge pull request #132 from codefordurham/map

Added link in the map popup
changes from the meeting tonight
Merge branch 'develop' into new-design

Conflicts:
	eatsmart/static/css/site.css
Prevents the importer from overwriting the property_id field
Merge pull request #137 from codefordurham/api_import_fixes

Prevents the importer from overwriting the property_id field
add link to feedback form
Merge pull request #131 from codefordurham/new-design

New design proposal
Merge pull request #139 from codefordurham/feature/feedback-link

Add link to feedback form
Update README.rst
Update README.rst
Update README.rst
Merge branch 'develop' into feature/wake-county