Resolved stripe errors
Merge branch 'master' into staging
Added custom error pages