Merge branch 'c4c.staging.civicrmid' into c4c.staging

Conflicts:
	app/models/person.rb
	db/development_structure.sql
Remove set_french_campus_names old rake task
Merge branch 'c4c.staging.cleanup_misc_rake' into c4c.staging