CRM-14955 - add custom tokens to greetings

----------------------------------------
* CRM-14955: can't add custom defined tokens to custom greetings
  https://issues.civicrm.org/jira/browse/CRM-14955
Merge pull request #3616 from jmcclelland/greetings-hook-tokens

CRM-14955 - add custom tokens to greetings