Add functional tests to people block plugin. Fix issues related to people block plugin
Fix pagination for parent contents at context content block
Merge branch 'ActionItem2888' into stable
Merge branch 'ActionItem2859' into stable

Conflicts:
	app/controllers/admin/environment_design_controller.rb
	test/functional/environment_design_controller_test.rb