Share the progress of the charity details
Merge branch 'master' of github.com:bostko/tardis into charity_details

Conflicts:
	app/controllers/charity_campaign_controller.rb
	config/routes.rb
fb buttons