added stubs to all the emails
timeout fix
Merge branch 'brian' into walport
merging stripe
nav fixed
Merge branch 'walport' into stripe