Add locations, location and players isActive, updates how locations are displayed for activities
removed unnecessary file
Merged changes