Merge branch 'master', remote-tracking branch 'origin'
commit to update master
Merge branch 'master' of github.com:openrural/open-data-nc
merging
merging
retry merge
Merge remote-tracking branch 'origin/master' into homepage-work
Suggest page formatted, home page featured projects updated
Adding new migrations to incorporate ryan feedback.
Merge branch 'homepage-work'

Conflicts:
	opendata/fields_info.py
	opendata/templates/home.html
Incorporated ryan changes for the admin interface.