some changes in users page
fixed conflicts
redone user info page
Merge branch 'master' of https://github.com/alexey-kozlenkov/ExadelPractice
Merge branch 'develop'
Add entites, DAO & services for SkillType & SkillSet
Merge branch 'master' into develop
Merge branch 'kozlenkov'
Merge branch 'develop'