Update _marketing.twig

Adding date and location information
Merge branch 'master' of github.com:PHPBenelux/opencfp into feature/update-for-2015

* 'master' of github.com:PHPBenelux/opencfp:
  Update _marketing.twig

Conflicts:
	templates/_marketing.twig