Added route methods
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Controller/BaseController.php