translations(es-MX) of observations
Merge pull request #22 from calonso-conabio/master

translations (es-MX) observations
translations es-MX conabio
commit since #22
Merge pull request #34 from calonso-conabio/master

more translations es-MX
Some minor English translation issues.
Some fixes to recent translation work.
Merge branch 'master' into i18n

Conflicts:
	app/views/photos/_photo_list_form.html.erb
	app/views/users/index.html.erb
	config/locales/en.yml
	config/locales/es.yml
	public/javascripts/jquery/plugins/inat/photo_selectors.js
	public/javascripts/jquery/plugins/inat/taxon_selectors.js
	public/javascripts/translations.js
Some more minor translations.
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.
CONABIO photo provider
Merge remote-tracking branch 'upstream/master'
Rails version bump.
Bootstrapified journals, more trips integration.
Merge branch 'trips'

Conflicts:
	public/javascripts/translations.js