Work on discover v2
Merge branch 'pulse_cdm' into c4c.staging.discover-v2
Merge branch 'pulse_cdm' into c4c.staging.discover-v2
Merge branch 'pulse_cdm' into c4c.staging.discover-v2
Correct discover volunteer activity report numbers; Add total row
Fix contacts trusting God column to support full text
Work on discover insights reports
Finished civicrm_schools show page and tweaks
Add discover feed
Merge branch 'c4c.staging.discover-v2' into pulse_cdm

Conflicts:
	db/development_structure.sql
Add discover report permissions
Add discover report permissions (missed migration file)
Fix mis-matching id on activity type
Add 'Added' search filter to survey contact search
Add 'Added' column to survey contact search results; Add 'Added' to survey contact edit
Merge in jquery.DataTables files
Update jquery-ui and theme; Add datatables to Discover reports
Remove jquery effects to prevent issue
Merge branch 'c4c.staging.schoolinfo' into pulse_cdm

Conflicts:
	db/development_structure.sql
	public/stylesheets/style.css
Merge branch 'pulse_cdm' into c4c.staging.discover-v2