tests for Skill and SkillCategory
Merge remote-tracking branch 'origin/master'