added new activity for joining game
merged changes from remote