[Tak] Fix everything
Merge branch 'master' of https://github.com/phlip9/wepay

merge