fix phpdoc
Merge branch 'rewrite'
Merge branch 'master' of github.com:thelia/thelia