Updated DISC implementation to use User Values to store DISC Assessment results. Added a third User Value related method, GetAllUserValues(), adding to GetUserValue(string key) and SetUserValue(string key, string value) methods.
Namespaced Person Value key to reduce potantial for collisions.
Namespaced Person Value key to reduce potantial for collisions.
Merge branch 'feature-dm-UsingUserValues' of https://github.com/swedd/Rock-ChMS into feature-dm-UsingUserValues
Added DiscService.GetSavedScores(Person person) method to get a Person's saved DISC scores. Returns zeroes if there are no scores saved.
Merge remote-tracking branch 'origin/develop' into feature-dm-UsingUserValues
Renamed Person Attributes and made them Core Attributes
Merge remote-tracking branch 'origin/develop' into feature-dm-UsingUserValues
Merge remote-tracking branch 'origin/develop' into feature-dm-UsingUserValues

Conflicts:
	Rock/Web/UI/Block.cs
	Rock/Web/UI/Page.cs
Fixing DISC person attribute names.
Update roles dropdown list in security dialog to display in alpha order
Fix bug with editing values where only the first setting could be saved.
Fix some setting values created in initial migration
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	RockWeb/Blocks/Administration/Attributes.ascx.cs
demo change
update comment on system attribute
Merge remote-tracking branch 'origin/develop' into develop
Undo demo change
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'origin/develop' into feature-dm-UsingUserValues