CRM-12396

----------------------------------------
* CRM-12396: tokens in html not transformed
  http://issues.civicrm.org/jira/browse/CRM-12396
Merge pull request #503 from dlobo/CRM-12396

CRM-12396