Module WBS-Activity Completion (second step): refs #501 #507
Module WBS-Activity Completion (second step): refs #501 #507, commit after resolving conflicts