Update heroku
Quick FB Test
FB Test Fix
Update Github Merge
Merge branch 'facebook-work'

Conflicts:
	app/views/layouts/application.html.erb
Reconcile GitHub Issues