Merge branch 'master' of https://github.com/GeniusReferrals/GRPHPSandbox

Conflicts:
	uploads/qrcode.png
Merge branch 'master' of https://github.com/GeniusReferrals/GRPHPSandbox