Merge branch 'dev' of https://github.com/dotpay/PrestaShop into dev

Conflicts:
	controllers/front/urlc.php
	dotpay.php

Signed-off-by: Piotr Karecki <piotr.karecki@dotpay.pl>
git-ignore