Merge remote-tracking branch 'origin' into community-validation

Conflicts:
	db/schema.rb
allow popovers in certificate header
changed verify to be in popover
Merge branch 'community-validation' into staging