Merge branch 'master' into rewrite

Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql

core/lib/Thelia/Model/Category.php

@@ -2,6 +2,7 @@
 
 namespace Thelia\Model;
 
+use Thelia\Core\Event\CategoryEvent;
 use Thelia\Model\Base\Category as BaseCategory;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Tools\URL;