update from core (reverted from commit 9a85ddad5538af4310ff2a68fa1ac7d29d67c143) (rollback core to just before LocationType changes)
fix GroupList column typo
CommentOut ColorField references since we are using a Rock.Dll that doesn't have that yet
update automigrate to false (that's what we have production set to)
Merge branch 'develop' (using version of Core prior to LocationType update, which is prior to ColorType field, so that arena is compatible)