Merge branch 'master_colivre' into AI2694-network_activity_email

Conflicts:
	test/unit/person_test.rb
Fix person notification for actions with comments

(ActionItem2694)
.orig files removed
Merge branch 'AI2694-network_activity_email' into stable