Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/campussaintchristophe/css/main.css