Merge pull request #126 from MargaretLangley/master

cycle form changed to remove empty space at top of form
account property_id not nil.
Index Spacing actions in the same manner (putting space between other buttons and delete
Property => Property ID, Client => Client ID
template changed to invoice_text