Merge branch 'master' of github.com:rafrafgit/coach
Merge branch 'master' of github.com:rafrafgit/coach
Merge branch 'master' of github.com:rafrafgit/coach
added billing fields to payments show & editpages