Correction to Event Resort for Same Dates
Merge branch 'master' of github.com:creativeslice/goldenegg

Conflicts:
	admin/admin.php
Clean Up merge