sf
Merge remote-tracking branch 'origin/master'

Conflicts:
	contact.php
	css/style.css
	inc/speaker.php
	index.php
	js/function.js