added activity type, subtype, and activity. Also changed name waypoints
in activity entity to activitypoints