Added Choose Activity (Marking)

Also changed all instances of "Assignment" to "Activity."