Getting trial information from customer info instead of invoices
Merge branch 'register' into testing
Fixing merge conflict