Change Checkout merchant creation account details to come from DB
Fix Sharetribe mentions from admin notification mail
fix tests
Merge branch 'master' into checkout-api-key-change

Conflicts:
	db/structure.sql
Merge pull request #346 from sharetribe/checkout-api-key-change

Checkout api key to DB