Merge branch 'weddings-and-functions'

Conflicts:
	sites/all/themes/pcdc/css/default.css
	sites/all/themes/pcdc/sass/default.scss