Start on trips, just models and basic form.
Merge branch 'master' into trips

Conflicts:
	public/javascripts/translations.js
Got the basic form working with most of the moving parts.
Merge branch 'master' into trips

Conflicts:
	db/structure.sql
	public/javascripts/translations.js
	public/stylesheets/index.css
Very basic trips/show.
Basic integration with journal.
Rails version bump.
Bootstrapified journals, more trips integration.
Merge branch 'trips'

Conflicts:
	public/javascripts/translations.js
Basic testing and docs for trips api.
Merge branch 'master' of github.com:inaturalist/inaturalist
Minor bugfix.
Several minor fixes for trips/posts.
Gonna get the hang of this eventually.
Minor fix.
Attempted bug fix for routing error. Overriding URL helpers might not have been a great idea.
Renamed counter cache cols on obs.
Rails bug was causing these to be updated inaccurately.
Added add and remove from obs tools for trips.
Bugfix: places/show introduced filter wasn't working.
Bugfix: lists weren't always showing common names due to lexicon filtering.