Bugfix: project maps weren't zooming to place boundary when visible and no zoom level set.
Syntax bug.
Merge branch 'master' into i18n
Tried to address some deleted user issues.
Bugfix: headers weren't getting expired correctly after username change.
Removed obsolte flickr/link.
Bugfix: latLonSelector was broken on obs/edit.
CONABIO translations.
Merge branch 'master' into i18n

Conflicts:
	app/views/facebook/options.html.erb
	app/views/flickr/_photos_form_field.html.erb
	app/views/flickr/link.html.erb
	app/views/observations/_form_fields.html.erb
	app/views/observations/_observation_form_field_rows.html.erb
	app/views/observations/import.html.erb
	app/views/taxa/flickr_tagger.html.erb
	app/views/users/dashboard.html.erb