Merge pull request #78 from MargaretLangley/master

Template views upgraded
Invoicing pages restyled, removal of unused class