Added join event functionality
Trying to fix merge
Another merge tool
Added the services to join and leave an event