Pin payment api by Jackson
test
Merge branch 'master' of https://github.com/snapfrozen/boxomatic

Conflicts:
	controllers/ShopController.php
Pin payment API by Jackson