i dont even
Merge branch 'master' of github.com:loyaltylion/loyaltylion-prestashop

Conflicts:
	loyaltylion.php