Add $COMPANY_NAME$ as a field for templates & remove hardcoded sender tag

Currently in the templates I can't add company name this means that I have to change my name under "My Profile" to the company name.

Also when a template is sent it automatically populates the "from" field with $SENDER_NAME$ which again would mean if another account user sent the mail it would come from their name and not the company.

The request is as follows...

1) Allow $COMPANY_NAME$ as a supported Tag

2) Allow the option to change email sender from hardcoded $SENDER_NAME$ to $COMPANY_NAME$ or $LANDLORD_NAME$

Thanks