paypal merge fix
Merge branch 'dev' of https://github.com/globeFrEak/clancash into dev