menu items
skills page
categories page
skills and categories pages
Skill and SkillCategory entity
add and edit forms for skill and skillCategory entity
skill and skillCategory grid and delete action
Merge branch 'master' of https://github.com/mediahost/sc

Conflicts:
	app/model/installer/Installer.php