Merge pull request #127 from MargaretLangley/master

template changed to invoice_text
Cycles and User show - Refactor views