Merge branch 'master' of https://github.com/paymentwall/paymentwall-php
Merge branch 'dev'