Clean-up
Merge branch 'master' of https://github.com/whoi/prestashop-vpos