context_content: fix pagination view
Translate person notifier mail

(ActionItem2694)
Merge branch 'AI2694-network_activity_email' into stable
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
Merge branch 'stable' of gitlab.com:participa/noosfero into stable
Merge branch 'AI2942-pairwise_plugin' into stable
Merge branch 'AI2945_context_content_fixes' into stable
Merge branch 'stable' of gitlab.com:participa/noosfero into stable
Merge branch 'AI2942-pairwise_plugin' into stable
Merge branch 'stable' of github.com:SerproLivre/noosfero into stable
context_content: fix pagination view
Merge branch 'AI2945_context_content_fixes' into stable

Conflicts:
	plugins/context_content/views/blocks/_more.rhtml
Merge branch 'stable' of gitlab.com:participa/noosfero into stable
Merge branch 'AI2942-pairwise_plugin' into stable
Merge branch 'stable' of gitlab.com:participa/noosfero into stable
Fix creation of admin url on profile_image and profile_info blocks

(ActionItem3015)
Remove unused method (profile_info) from profile_controller

(ActionItem3015)