Merge branch 'pulse_cdm' into c4c.staging
Merge branch 'c4c.tweak' into c4c.staging

Conflicts:
	app/views/people/directory.html.erb
Merge branch 'c4c.fix' into c4c.staging
Merge branch 'c4c.staging' of github.com:twinge/ministry-tracker into c4c.staging
Merge branch 'c4c.jr.ie_warning_sign_in' into c4c.staging
Merge branch 'c4c.codes' into c4c.staging
Merge branch 'c4c.tweak' into c4c.staging
Merge branch 'c4c.link_bar_widget' into c4c.staging
Merge branch 'c4c.link_bar_widget' into c4c.staging
Merge branch 'c4c.link_bar_widget' into c4c.staging
Merge branch 'c4c.invite' into c4c.staging
Merge branch 'c4c.invite' into c4c.staging
Merge branch 'c4c.link_bar_widget' into c4c.staging
Merge branch 'c4c.link_bar_widget' into c4c.staging
Merge branch 'c4c.link_bar_widget' into c4c.staging
Merge branch 'c4c.gcxbar_revealer' into c4c.staging
Merge branch 'c4c.import_countries' into c4c.staging
update ref
update dev struct
remove old link bar partial