Categories ordrering in the catalog
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php