Merge https://github.com/emont01/laravel-payments

Conflicts:
	controllers/payments.php
Merge branch 'master' of https://github.com/pixmat/laravel-payments