Fix user email CRM-12285
-- CRM-12348 Minor Fix
Give WP more flexibility in layout of WP code vs CiviCRM location
Merge pull request #431 from ravishnair/CRM-12348

-- CRM-12348 Minor Fix
Merge pull request #433 from dlobo/CRM-12356

Give WP more flexibility in layout of WP code vs CiviCRM location
Merge pull request #429 from colemanw/userEmail

Fix user email CRM-12285
worked on CRM-12285, udpate CMS email if primary email of contact is updated.

----------------------------------------
* CRM-12285: Editing an email using the 'inscreen' edit option does not update the drupal user email, where the email is used for the uf_match
  http://issues.civicrm.org/jira/browse/CRM-12285
Merge pull request #437 from kurund/updateCMSEmail

worked on CRM-12285, udpate CMS email if primary email of contact is upd...
CRM-12325 Corrected erroneous help info on message template page and form, and consolidated the help. Also added help and link to book on Scheduled Reminders page.

----------------------------------------
* CRM-12325: Correct and clarify help regarding use of tokens for events, memberships, and activities in message templates
  http://issues.civicrm.org/jira/browse/CRM-12325
Merge pull request #438 from davecivicrm/CRM-12325

CRM-12325 Corrected erroneous help info on message template page and for...