- Fix incorrect colspan calculation
- Add invoice test template
Merge branch 'develop'
Merge branch 'master' into github