Merge branch 'develop'
Update GroupTypeDetail to show inherited attributes
Add migration to create route for GroupTypeDetail page
+ Add page to manage attributes for any entity type and moved sql command page
Updated check-in sample data script to create fewer attributes and take advantage of inherited attributes
Update system group types so they are not displayed in group viewer and group list
Merge branch 'develop'
Max member alert
Group Membership validation
Moved page icon to the page title line and removed the pageoverview section.
group member minimum and maximum validation
Merge branch 'develop'
Merge branch 'feature-csf-groupmember'
+ Change the Organization Address global attribute to use a location field instead of free text
+ Modified some location fields to be more consistent
fix up typos in fieldtype comments
Updated web.config so that website will be compiled in batchmode (batch=true).  It seems to be much faster (15 seconds vs 45 seconds for a full website rebuild).
Added new EncryptedFieldType/EncryptedFieldAttribute which saves it's value in the database encrypted (it gets encrypted/decrypted at the AttributeValue Model layer)
ToDo:  Convert things that should be converted to EncryptedField and make a migration to update the values in the database
fix up AttributeValue so that Encrypted fields don't logged the decrypted data to the Audit Log
Added short codes to Campus model
Merge branch 'develop'

Conflicts:
	Rock/Rock.csproj