updated composer
merged with master
began with unique key
quick bugfix
Merge branch 'develop' of git://github.com/sulu-cmf/SuluCategoryBundle into feature/key
adde unique key and children action
added translation for content type
smaller fixes
Merge pull request #12 from sulu-cmf/feature/key

[FEATURE] children action
Added CONTRIBUTING
Merge pull request #13 from sulu-cmf/feature/contributing

Added CONTRIBUTING
build dist files
style fix
fixed schema
Merge branch 'hotfix/category-content-type' into develop

Conflicts:
	composer.json
corrected icon for navigation
fixed test cases
Merge branch 'develop'
updated version numbers
Merge branch 'master' of git://github.com/sulu-cmf/SuluCategoryBundle