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.