Updated templates for revisions on email send outs.
Removed conflict filed by git on view_notify_client_for_newline_client.php