Bug fixes
Merge branch 'master' of https://github.com/DannyWalsh066/RSVPme

Conflicts:
	application/controllers/eventguide.php
	application/models/email_model.php
	application/models/facebook_integration_model.php
	application/views/email/html_email_ticket.php