Better invoice support.
Merge branch 'master' of github.com:CTPUG/wafer
Merge branch 'master' of github.com:CTPUG/wafer