Create NewFamily block
Change attributes to have a multiple categories instead of one free-text category
Temp stage of attribute/category changes
Merge branch 'origin/develop'

Conflicts:
	Rock/Rock.csproj
More changes to support adding categories to attributes
Add block for editing attribute categories (since they can't be added using the current category picker)
Merge branch 'feature-dt-attributecategory'
Update code generation to not ignore properties that were virtual because the belonged to an interface
Undo attempt to change default text from <none> to <all>, will add Trello item for Jason :)
Fix qualifier comparison on category get children rest method
Refactored RockCSharpMigrationCodeGenerator to limit Migration operations to only Entities that are directly associated with the DbContext, either as a DbSet<> of the DbContext or as just an AssociationTable (from relationship definitions in the DbContext)
Update how attributes create their associated edit fields so that ID is created correctly and prior to controls needing to reference the id
Reverse Merge -  Ooops, this only works in EF6!

Refactored RockCSharpMigrationCodeGenerator to limit Migration operations to only Entities that are directly associated with the DbContext, either as a DbSet<> of the DbContext or as just an AssociationTable (from relationship definitions in the DbContext) (reverse-merged from commit cfd030449484e83e605053657e6cea69f3ecf92c)
Changing Rock's RockCSharpMigrationCodeGenerator to RockCSharpMigrationCodeGenerator<Rock.Data.RockContext>( false ), since the fancy RockCSharpMigrationCodeGenerator fixes for skips only works in EF6
Merge branch 'develop'