fixed typo
Merge branch 'master' of https://github.com/thelia/thelia
Merge branch 'master' of https://github.com/thelia/thelia
Merge branch 'master' of https://github.com/thelia/thelia
Merge branch 'master' of https://github.com/thelia/thelia
Added process_assets config variable
Merge branch 'master' of https://github.com/thelia/thelia
Merge branch 'master' of https://github.com/thelia/thelia