Module WBS-Activity Completion (first step): refs #397
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/helpers/projects_helper.rb