dunno, really
Merge branch 'master' of github.com:Juleship/TEDxTrento

Conflicts:
	page-speakers.php