WCMS-160 Add memberships to department.
Merge branch 'master' into team_string
Renaming `@obj` to `@parent`
Refactoring `redirect_to_parent` method.
Merge branch 'master' into team_string

Conflicts:
	app/views/groups/edit.html.slim
clearing department.person_ids after migrating them to memberships.
Merge pull request #51 from biola/team_string

Added department/person association with `team` metadata
Merge branch 'master' into remove_services