3.1.15 & 3.1.16

We fixed a templating bug in which account numbers were not being assigned to groups and when duplicate account numbers were assigned to tax groups and tax only accounts.