Please complete merge for UF-316 first

Adding the skills legend to the user edit menu, and organizing social media edit fields into a single group.