Merge pull request #25 from CruGlobal/semi-secure

Changes for [INFO-183]
Add more relationships to the activities endpoint.
Don't try to render a team row if an activity doesn't have a team
Simplify deep intersection method and add specs.
Merge pull request #26 from CruGlobal/api_changes

Add more relationships to the activities endpoint.
Fix Movement status thresholds
Tweak help text for spiritual conversations.
Add functionality needed for SP
Delete commented out lines
Merge pull request #27 from CruGlobal/INFO-185__api_changes_fo_sp

Add functionality needed for SP
Handle multiple partners getting passed in.

I don’t see where this is actually used, but the old code supported it, so I’m not comfortable removing support for it without more testing.
Merge branch 'INFO-185__api_changes_fo_sp' of github.com:CruGlobal/infobase into INFO-185__api_changes_fo_sp

Conflicts:
	app/controllers/api/v1/statistics_controller.rb
Update guard gem
Merge branch 'INFO-185__api_changes_fo_sp'
Fix escaping of partnerships
Add region and teams to target area api
Add more filters and functionality for SP
Revert change that was causing an infinite serializer loop.
More changes/additions for SP.
Optimize statistics output.