Work in progress
Merge branch 'billing' of github.com:kili/dashboard into billing