remove word 'journal' from project posts
share observations on facebook
add observation facebook sharing preference
add twitter gem + support for tweeting observations
auto-post observations to twitter, including user preference to opt out
only show sharing options for services the user has authorized
don't show auto-sharing options if user hasn't authorized any 3rd party services
Merge remote branch 'upstream/master'

Conflicts:
	Gemfile.lock
	app/models/user.rb
	app/views/projects/show.html.erb
	app/views/users/edit.html.erb
	db/schema.rb
remove debug info
change fb sharing to opengraph
move fb+twit sharing to delayed job
smarter+cleaner fb/twitter observation sharing
Merge remote branch 'upstream/master'

Conflicts:
	Gemfile.lock
	app/models/observation.rb
	app/views/observations/show.html.erb
	db/schema.rb
fix gemfile twitter dependency issue
Modifications to fb sharing and open graph stuff.
Merge branch 'altay'

Conflicts:
	Gemfile.lock
	db/structure.sql
Removed a ref to inatdev.
Changed OAuth2 assertion flow to allow an assertion_type param instead of grant_type.
CONABIO translations.
Merge branch 'master' into i18n

Conflicts:
	app/views/users/edit.html.erb