Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	wordpress/themes/pnc-parallax/style.css