Merge branch 'c4c.staging.hotfix' into pulse_cdm

Conflicts:
	config/environment.rb
Merge branch 'c4c.staging.hotfix' into pulse_cdm
Create label directory view
Merge branch 'c4c.staging.label_directory_view' into c4c.staging