Categories refactoring
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html
Merge branch 'master' of https://github.com/thelia/thelia
Merge branch 'master' of https://github.com/thelia/thelia
Continuing categories administration...
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
Merge branch 'master' of https://github.com/thelia/thelia
Factorized creation and confirmation modal dialogs