Merge branch 'master' into maker_payments

Conflicts:
app/models/app_signup.rb