Removed the old, complicated branch structure in favor of the all-master structure
Activity