Added category nestedset
Merge branch 'master' of https://github.com/isics/OpenMiamMiam

Conflicts:
	app/config/config.yml
	src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Catalog/showCategory.html.twig