Merge remote-tracking branch 'origin/feature-2106/add-category-to-skills' into feature-2106/add-category-to-skills

# Conflicts:
#	server/src/main/java/com/objectcomputing/checkins/security/permissions/Permissions.java

Author: pieperm