fixing invite flow and billing
Merge branch 'master' of github.com:mihok/trend-brightalmond