Added OrganizationAddress in migration and GeoPicker now centers on that address when nothing else is present.  Also added ability to cancel GeoPicker (without changing previous value).
The migration for the OrganizationAddress and 'Rock Solid Church' default organization name.
Add migration for GoogleAPIKey global attribute, add state/city labels into GeoPicker, move AddGlobalAttribute and UpdateAttribute into base migration class, correct wording on GroupType help text.
Add Categories field type that CategoryField and AttributeCategoryField attributes can use to select multiple attribute values
Update ListControl adapters to render code necessary for handling AutoPostbacks
Updat LabeledCheckbox so that when help text is specified without a label, that help block is rendered after the checkbox value
Update how attributes render required controls so that validation occurs
Add block for viewing/editing attribute categories on person profile page, and update new family block to render and validate attributes correctly
Fix incorrectly merged conflict
Update NewFamily block to use state abbreviation, and fix rendering when Gender is required
Migration for NewFamily page
Update DefinedValue fieldtype and attribute values to store value as Guid instead of Id
Update migration createion script to ignore attributes that aren't for blocks
Update migration for new family block
- added new IHidable so that blocks can be hidden by other blocks.  Needed so that the Notes Block can be hidden in Residency
fix up class filename to match
fix up bug in how 3rd Party EntityType is looked up in PageCache
Update PageCache and Service so that we can use [ContextAware] with both Rock core entities and also Plugin entities
+ 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