+ Add attribute/field type/control for selecting a group type/role combination
+ Fix relative paths on badges and person links
+ Update FamilyMembers block to render controls (w/ postback functionality) rather than using XSLT
+ Created Initial EditFamily block
Merge branch 'origin/develop'

Conflicts:
	Rock/Model/Location.cs