Add profile2 to us_people feature
Merge branch '2.x' of github.com:scottrigby/utopiaschool into 2.x