Ammended implementation to support the Person -> RoleSchool relationship
Merge origin/master