Add entites, DAO & services for SkillType & SkillSet
Merge branch 'master' into develop
Merge branch 'kozlenkov'
Merge branch 'develop'