WIP
Merge branch 'master' of https://github.com/familiar-studio/stripe2salesforce

Conflicts:
	web.js
merge conflict